Changes in trunk/src/CMakeLists.txt [2465:2370]

File:

• trunk/src/CMakeLists.txt (modified) (3 diffs)

trunk/src/CMakeLists.txt

@@ -21 +21 @@
 # source files for libpyrap
 set( ASAP_SRCS
-     ${SRCDIR}/concurrent.cpp
      ${SRCDIR}/MathUtils.cpp
      ${SRCDIR}/TableTraverse.cpp
@@ -83 +82 @@
      ${SRCDIR}/python_asap.cpp )
 
-add_library( ${ASAPLIB} SHARED ${ASAP_SRCS} )
-add_library( ${ASAPPYLIB} SHARED ${ASAP_PYSRCS} )
+add_library( ${ASAPLIB} SHARED ${ASAP_SRCS} ${ASAP_PYSRCS} )
 
 # library name must be _asap.so
-set_target_properties( ${ASAPPYLIB}
+set_target_properties( ${ASAPLIB}
                        PROPERTIES
-                       PREFIX ""
+                       PREFIX _
                        SUFFIX .so )
 
@@ -98 +96 @@
                        #${CASACORE_LIBRARIES} 
                        ${WCSLIB} )
-target_link_libraries( ${ASAPPYLIB} 
-                       ${ASAPLIB} )
 
-add_dependencies( inst ${ASAPLIB} 
-                       ${ASAPPYLIB} )
+add_dependencies( inst ${ASAPLIB} )
 
 # 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}/_asap.so ${CMAKE_INSTALL_PREFIX}/lib/_asap.so
+    OUTPUT_VARIABLE stuff)
+endif()