Changeset 3055


Ignore:
Timestamp:
10/27/15 13:49:16 (8 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: Yes CAS-7917

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: No

Test Programs: test_importasdm, test_importasdm_mms, alma-m100-analysis-regression, alma-m100-sd-regression

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...


The cmake setting for asap is changed to ignore building asdm2ASAP. Additional dependency on libxml2 and libalma, which is required for asdm2ASAP, is also removed.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3054 r3055  
    727727set( ATNFLIB atnf_asap )
    728728set( ASAP2TO3 asap2to3 )
    729 if ( NOT STANDALONE )
     729#if ( NOT STANDALONE )
    730730#   set( ASDM2ASAP_OLD oldasdm2ASAP )
    731    set( ASDM2ASAP asdm2ASAP )
    732 endif()
     731#   set( ASDM2ASAP asdm2ASAP )
     732#endif()
    733733
    734734#
  • trunk/cmake/withcasa.cmake

    r3040 r3055  
    152152# CASA (only alma/ASDM)
    153153#
    154 find_path( LIBXML2_INCLUDE_DIR libxml/xmlversion.h
    155            HINTS ${LIBXML2_ROOT_DIR}/include
    156            PATH_SUFFIXES libxml2 )
    157 if( LIBXML2_INCLUDE_DIR MATCHES "NOTFOUND$" )
    158    message( FATAL_ERROR "libxml/xmlversion.h could not be found. Please check!" )
    159 endif()
    160 message( STATUS "LIBXML2_INCLUDE_DIR = " ${LIBXML2_INCLUDE_DIR} )
    161 find_path( LIBXML2_LIBRARY libxml2${CMAKE_SHARED_LIBRARY_SUFFIX}
    162            HINTS ${LIBXML2_ROOT_DIR}
    163            PATHS /usr
    164            PATH_SUFFIXES lib64 lib lib/x86_64-linux-gnu)
     154#find_path( LIBXML2_INCLUDE_DIR libxml/xmlversion.h
     155#          HINTS ${LIBXML2_ROOT_DIR}/include
     156#           PATH_SUFFIXES libxml2 )
     157#if( LIBXML2_INCLUDE_DIR MATCHES "NOTFOUND$" )
     158#   message( FATAL_ERROR "libxml/xmlversion.h could not be found. Please check!" )
     159#endif()
     160#message( STATUS "LIBXML2_INCLUDE_DIR = " ${LIBXML2_INCLUDE_DIR} )
     161#find_path( LIBXML2_LIBRARY libxml2${CMAKE_SHARED_LIBRARY_SUFFIX}
     162#          HINTS ${LIBXML2_ROOT_DIR}
     163#           PATHS /usr
     164#           PATH_SUFFIXES lib64 lib lib/x86_64-linux-gnu)
    165165#find_path( LIBXML2_LIBRARY libxml2.so )
    166 if ( LIBXML2_LIBRARY MATCHES "NOTFOUND$" )
    167    message( FATAL_ERROR "libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} could not be found. Please check!" )
    168 endif()
    169 message( STATUS "LIBXML2_LIBRARY = " ${LIBXML2_LIBRARY} )
    170 
    171 set( ASDM_INCLUDE_ROOT ${CASA_CODE_PATH} )
    172 if ( EXISTS ${CASA_CODE_PATH}/include/alma )
    173    set( ASDM_INCLUDE_ROOT ${CASA_CODE_PATH}/include )
    174 endif()
     166#if ( LIBXML2_LIBRARY MATCHES "NOTFOUND$" )
     167#   message( FATAL_ERROR "libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} could not be found. Please check!" )
     168#endif()
     169#message( STATUS "LIBXML2_LIBRARY = " ${LIBXML2_LIBRARY} )
     170
     171#set( ASDM_INCLUDE_ROOT ${CASA_CODE_PATH} )
     172#if ( EXISTS ${CASA_CODE_PATH}/include/alma )
     173#   set( ASDM_INCLUDE_ROOT ${CASA_CODE_PATH}/include )
     174#endif()
    175175#set( ASDM_INCLUDE_DIR_OLD ${ASDM_INCLUDE_ROOT}/alma/ASDM
    176176#                          ${ASDM_INCLUDE_ROOT}/alma/Enumerations
     
    187187#set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma_v3${CMAKE_SHARED_LIBRARY_SUFFIX}
    188188#                  ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
    189 set( ASDM_INCLUDE_DIR ${ASDM_INCLUDE_ROOT}/alma/ASDM
    190                       ${ASDM_INCLUDE_ROOT}/alma/Enumerations
    191                       ${ASDM_INCLUDE_ROOT}/alma/ASDMBinaries
    192                       ${ASDM_INCLUDE_ROOT}/alma/Enumtcl
    193                       ${LIBXML2_INCLUDE_DIR} )
    194 if ( NOT ALMA_LIB_PATH )
    195    set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX}
    196                      ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
    197 else( )
    198    set( ASDM_LIBRARY ${ALMA_LIB_PATH}
    199                      ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
    200 endif( )
    201 message( STATUS "ASDM_LIBRARY = " ${ASDM_LIBRARY} )
    202 add_definitions( -DWITHOUT_ACS )
    203 
    204 set( COMPONENTS_INCLUDE_ROOT ${CASA_CODE_PATH} )
    205 if ( EXISTS ${CASA_CODE_PATH}/include/components )
    206    set( COMPONENTS_INCLUDE_ROOT ${CASA_CODE_PATH}/include )
    207 endif()
    208 set( COMPONENTS_INCLUDE_DIR ${COMPONENTS_INCLUDE_ROOT}/components/SpectralComponents )
    209 if ( NOT COMPONENTS_LIB_PATH )
    210    set( COMPONENTS_LIBRARY ${casaroot}/${arch}/lib/libcomponents${CMAKE_SHARED_LIBRARY_SUFFIX} )
    211 else( )
    212    set( COMPONENTS_LIBRARY ${COMPONENTS_LIB_PATH} )
    213 endif( )
     189#set( ASDM_INCLUDE_DIR ${ASDM_INCLUDE_ROOT}/alma/ASDM
     190#                      ${ASDM_INCLUDE_ROOT}/alma/Enumerations
     191#                      ${ASDM_INCLUDE_ROOT}/alma/ASDMBinaries
     192#                      ${ASDM_INCLUDE_ROOT}/alma/Enumtcl
     193#                      ${LIBXML2_INCLUDE_DIR} )
     194#if ( NOT ALMA_LIB_PATH )
     195#   set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX}
     196#                     ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
     197#else( )
     198#   set( ASDM_LIBRARY ${ALMA_LIB_PATH}
     199#                     ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
     200#endif( )
     201#message( STATUS "ASDM_LIBRARY = " ${ASDM_LIBRARY} )
     202#add_definitions( -DWITHOUT_ACS )
     203
     204#set( COMPONENTS_INCLUDE_ROOT ${CASA_CODE_PATH} )
     205#if ( EXISTS ${CASA_CODE_PATH}/include/components )
     206#   set( COMPONENTS_INCLUDE_ROOT ${CASA_CODE_PATH}/include )
     207#endif()
     208#set( COMPONENTS_INCLUDE_DIR ${COMPONENTS_INCLUDE_ROOT}/components/SpectralComponents )
     209#if ( NOT COMPONENTS_LIB_PATH )
     210#   set( COMPONENTS_LIBRARY ${casaroot}/${arch}/lib/libcomponents${CMAKE_SHARED_LIBRARY_SUFFIX} )
     211#else( )
     212#   set( COMPONENTS_LIBRARY ${COMPONENTS_LIB_PATH} )
     213#endif( )
    214214
    215215#
     
    229229   add_subdirectory( python )
    230230   add_subdirectory( share )
    231    add_subdirectory( external-alma/asdm2ASAP )
     231#   add_subdirectory( external-alma/asdm2ASAP )
    232232#   add_subdirectory( external-alma/oldasdm2ASAP )
    233233endmacro( asap_add_subdirectory )
Note: See TracChangeset for help on using the changeset viewer.