Changeset 2236

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:

• trunk/cmake/withcasa.cmake (modified) (2 diffs)

trunk/cmake/withcasa.cmake

@@ -106 +106 @@
 endif()
 message( STATUS "LIBXML2_INCLUDE_DIR = " ${LIBXML2_INCLUDE_DIR} )
-find_path( LIBXML2_LIBRARY libxml2.so
+find_path( LIBXML2_LIBRARY libxml2${CMAKE_SHARED_LIBRARY_SUFFIX}
            PATHS /usr
            PATH_SUFFIXES lib64 lib )
 #find_path( LIBXML2_LIBRARY libxml2.so )
 if ( LIBXML2_LIBRARY MATCHES "NOTFOUND$" )
-   message( FATAL_ERROR "libxml2.so could not be found. Please check!" ) 
+   message( FATAL_ERROR "libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} could not be found. Please check!" )
 endif()
 message( STATUS "LIBXML2_LIBRARY = " ${LIBXML2_LIBRARY} ) 
@@ -119 +119 @@
                       ${CASA_CODE_PATH}/alma/implement/Enumtcl
                       ${LIBXML2_INCLUDE_DIR} )
-set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma.so
-                  ${LIBXML2_LIBRARY}/libxml2.so )
+set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX}
+ ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
 add_definitions( -DWITHOUT_ACS )