Changeset 3028 for trunk


Ignore:
Timestamp:
02/17/15 17:43:20 (10 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/cmake/standalone.cmake

    r2277 r3028  
    3636   add_subdirectory( share )
    3737   add_subdirectory( bin )
     38   add_subdirectory( external-alma/components )
    3839endmacro( asap_add_subdirectory )
  • trunk/cmake/withcasa.cmake

    r3006 r3028  
    199199add_definitions( -DWITHOUT_ACS )
    200200
     201set( COMPONENTS_INCLUDE_ROOT ${CASA_CODE_PATH} )
     202if ( EXISTS ${CASA_CODE_PATH}/include/components )
     203   set( COMPONENTS_INCLUDE_ROOT ${CASA_CODE_PATH}/include )
     204endif()
     205set( COMPONENTS_INCLUDE_DIR ${COMPONENTS_INCLUDE_ROOT}/components/SpectralComponents )
     206if ( NOT COMPONENTS_LIB_PATH )
     207   set( COMPONENTS_LIBRARY ${casaroot}/${arch}/lib/libcomponents${CMAKE_SHARED_LIBRARY_SUFFIX} )
     208else( )
     209   set( COMPONENTS_LIBRARY ${COMPONENTS_LIB_PATH} )
     210endif( )
     211
    201212#
    202213# subdirectories
  • trunk/src/CMakeLists.txt

    r2872 r3028  
    1010include_directories( ${SRCDIR}
    1111                     ${Boost_INCLUDE_DIR}
     12                     ${COMPONENTS_INCLUDE_DIR}
    1213                     ${ASAPROOT}/external-alma
    1314                     ${ASAPROOT}/external/libpyrap/pyrap-0.3.2 )
     
    137138                       ${ATNFLIB}
    138139                       #${CASACORE_LIBRARIES}
    139                        ${WCSLIB} )
     140                       ${WCSLIB}
     141                       ${COMPONENTS_LIBRARY} )
    140142target_link_libraries( ${ASAPPYLIB}
    141143                       ${ASAPLIB} )
Note: See TracChangeset for help on using the changeset viewer.