Changeset 2236


Ignore:
Timestamp:
07/19/11 14:56:45 (13 years ago)
Author:
Kana Sugimoto
Message:

New Development: No

JIRA Issue: No (a bug fix from Scott)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: build asap

Put in Release Notes: No

Module(s): asap

Description:

a bug fix from Scott to search for proper suffix resolution of shared libraries.


File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/cmake/withcasa.cmake

    r2210 r2236  
    106106endif()
    107107message( STATUS "LIBXML2_INCLUDE_DIR = " ${LIBXML2_INCLUDE_DIR} )
    108 find_path( LIBXML2_LIBRARY libxml2.so
     108find_path( LIBXML2_LIBRARY libxml2${CMAKE_SHARED_LIBRARY_SUFFIX}
    109109           PATHS /usr
    110110           PATH_SUFFIXES lib64 lib )
    111111#find_path( LIBXML2_LIBRARY libxml2.so )
    112112if ( LIBXML2_LIBRARY MATCHES "NOTFOUND$" )
    113    message( FATAL_ERROR "libxml2.so could not be found. Please check!" )
     113   message( FATAL_ERROR "libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} could not be found. Please check!" )
    114114endif()
    115115message( STATUS "LIBXML2_LIBRARY = " ${LIBXML2_LIBRARY} )
     
    119119                      ${CASA_CODE_PATH}/alma/implement/Enumtcl
    120120                      ${LIBXML2_INCLUDE_DIR} )
    121 set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma.so
    122                   ${LIBXML2_LIBRARY}/libxml2.so )
     121set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX}
     122 ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
    123123add_definitions( -DWITHOUT_ACS )
    124124
Note: See TracChangeset for help on using the changeset viewer.