Changeset 3028 for trunk

Timestamp:

02/17/15 17:43:20 (9 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue:

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description: modifications to use proper libcomponents.so.

Location:

trunk

Files:

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

trunk/cmake/standalone.cmake

@@ -36 +36 @@
    add_subdirectory( share )
    add_subdirectory( bin )
+   add_subdirectory( external-alma/components )
 endmacro( asap_add_subdirectory )

trunk/cmake/withcasa.cmake

@@ -199 +199 @@
 add_definitions( -DWITHOUT_ACS )
 
+set( COMPONENTS_INCLUDE_ROOT ${CASA_CODE_PATH} )
+if ( EXISTS ${CASA_CODE_PATH}/include/components )
+   set( COMPONENTS_INCLUDE_ROOT ${CASA_CODE_PATH}/include )
+endif()
+set( COMPONENTS_INCLUDE_DIR ${COMPONENTS_INCLUDE_ROOT}/components/SpectralComponents )
+if ( NOT COMPONENTS_LIB_PATH )
+   set( COMPONENTS_LIBRARY ${casaroot}/${arch}/lib/libcomponents${CMAKE_SHARED_LIBRARY_SUFFIX} )
+else( )
+   set( COMPONENTS_LIBRARY ${COMPONENTS_LIB_PATH} )
+endif( )
+
 #
 # subdirectories

trunk/src/CMakeLists.txt

@@ -10 +10 @@
 include_directories( ${SRCDIR} 
                      ${Boost_INCLUDE_DIR}
+                     ${COMPONENTS_INCLUDE_DIR}
                      ${ASAPROOT}/external-alma 
                      ${ASAPROOT}/external/libpyrap/pyrap-0.3.2 )
@@ -137 +138 @@
                        ${ATNFLIB} 
                        #${CASACORE_LIBRARIES} 
-                       ${WCSLIB} )
+                       ${WCSLIB} 
+                       ${COMPONENTS_LIBRARY} )
 target_link_libraries( ${ASAPPYLIB} 
                        ${ASAPLIB} )