Changeset 2573 for trunk


Ignore:
Timestamp:
06/19/12 11:23:17 (12 years ago)
Author:
Kana Sugimoto
Message:

New Development: No

JIRA Issue: No (changes in accordance to Wes' swig matter)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: build asap to work with swig

Put in Release Notes: No

Module(s):

Description:

Removed 'implement' in include pathes of ASDM related codes
based on Wes' request.


File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/cmake/withcasa.cmake

    r2558 r2573  
    124124endif()
    125125message( STATUS "LIBXML2_LIBRARY = " ${LIBXML2_LIBRARY} )
    126 #set( ASDM_INCLUDE_DIR_OLD ${CASA_CODE_PATH}/alma/implement/ASDM
    127 #                          ${CASA_CODE_PATH}/alma/implement/Enumerations
    128 #                          ${CASA_CODE_PATH}/alma/implement/ASDMBinaries
    129 #                          ${CASA_CODE_PATH}/alma/implement/Enumtcl
     126#set( ASDM_INCLUDE_DIR_OLD ${CASA_CODE_PATH}/alma/ASDM
     127#                          ${CASA_CODE_PATH}/alma/Enumerations
     128#                          ${CASA_CODE_PATH}/alma/ASDMBinaries
     129#                          ${CASA_CODE_PATH}/alma/Enumtcl
    130130#                          ${LIBXML2_INCLUDE_DIR} )
    131131#set( ASDM_LIBRARY_OLD ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX}
    132132#                      ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
    133 #set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma_v3/implement/ASDM
    134 #                      ${CASA_CODE_PATH}/alma_v3/implement/Enumerations
    135 #                      ${CASA_CODE_PATH}/alma_v3/implement/ASDMBinaries
    136 #                      ${CASA_CODE_PATH}/alma_v3/implement/Enumtcl
     133#set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma_v3/ASDM
     134#                      ${CASA_CODE_PATH}/alma_v3/Enumerations
     135#                      ${CASA_CODE_PATH}/alma_v3/ASDMBinaries
     136#                      ${CASA_CODE_PATH}/alma_v3/Enumtcl
    137137#                      ${LIBXML2_INCLUDE_DIR} )
    138138#set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma_v3${CMAKE_SHARED_LIBRARY_SUFFIX}
    139139#                  ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
    140 set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma/implement/ASDM
    141                       ${CASA_CODE_PATH}/alma/implement/Enumerations
    142                       ${CASA_CODE_PATH}/alma/implement/ASDMBinaries
    143                       ${CASA_CODE_PATH}/alma/implement/Enumtcl
     140set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma/ASDM
     141                      ${CASA_CODE_PATH}/alma/Enumerations
     142                      ${CASA_CODE_PATH}/alma/ASDMBinaries
     143                      ${CASA_CODE_PATH}/alma/Enumtcl
    144144                      ${LIBXML2_INCLUDE_DIR} )
    145145if ( NOT ALMA_LIB_PATH )
Note: See TracChangeset for help on using the changeset viewer.