Changeset 2465

Timestamp:

04/13/12 18:04:56 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-3960

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: run sd unit/regression tests

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

The library _asap.so is separated into two pieces:

• _asap.so now contains only python interfaces
• C++ engines are moved to new library libasap.so

The _asap.so is installed in the same place as before
($CASAROOT/python/2.6/asap) while libasap.so is installed to
$CASAROOT/lib.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• src/CMakeLists.txt (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -606 +606 @@
 # libraries and executables
 #
+set( ASAPPYLIB _asap )
 set( ASAPLIB asap )
 set( PYRAPLIB pyrap )

trunk/src/CMakeLists.txt

@@ -83 +83 @@
      ${SRCDIR}/python_asap.cpp )
 
-add_library( ${ASAPLIB} SHARED ${ASAP_SRCS} ${ASAP_PYSRCS} )
+add_library( ${ASAPLIB} SHARED ${ASAP_SRCS} )
+add_library( ${ASAPPYLIB} SHARED ${ASAP_PYSRCS} )
 
 # library name must be _asap.so
-set_target_properties( ${ASAPLIB}
+set_target_properties( ${ASAPPYLIB}
                        PROPERTIES
-                       PREFIX _
+                       PREFIX ""
                        SUFFIX .so )
 
@@ -97 +98 @@
                        #${CASACORE_LIBRARIES} 
                        ${WCSLIB} )
+target_link_libraries( ${ASAPPYLIB} 
+                       ${ASAPLIB} )
 
-add_dependencies( inst ${ASAPLIB} )
+add_dependencies( inst ${ASAPLIB} 
+                       ${ASAPPYLIB} )
 
 # install directory
 install( TARGETS ${ASAPLIB}
+         LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
+install( TARGETS ${ASAPPYLIB}
          LIBRARY DESTINATION ${PYTHON_INSTALL_DIR} )
-if( NOT STANDALONE )
-  execute_process(
-    COMMAND ln -Fs ../${PYTHON_INSTALL_DIR}/_${ASAPLIB}.so ${CMAKE_INSTALL_PREFIX}/lib/_${ASAPLIB}.so
-    OUTPUT_VARIABLE stuff)
-endif()
+#if( NOT STANDALONE )
+#  execute_process(
+#    COMMAND ln -Fs ../${PYTHON_INSTALL_DIR}/_${ASAPLIB}.so ${CMAKE_INSTALL_PREFIX}/lib/_${ASAPLIB}.so
+#    OUTPUT_VARIABLE stuff)
+#endif()