Changeset 2578 for trunk

Timestamp:

06/27/12 16:42:59 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: build asap

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Minor change to support before and after switch to swig.

File:

• trunk/cmake/withcasa.cmake (modified) (1 diff)

trunk/cmake/withcasa.cmake

@@ -124 +124 @@
 endif()
 message( STATUS "LIBXML2_LIBRARY = " ${LIBXML2_LIBRARY} ) 
-#set( ASDM_INCLUDE_DIR_OLD ${CASA_CODE_PATH}/alma/ASDM
-#                          ${CASA_CODE_PATH}/alma/Enumerations
-#                          ${CASA_CODE_PATH}/alma/ASDMBinaries
-#                          ${CASA_CODE_PATH}/alma/Enumtcl
+
+set( ASDM_INCLUDE_ROOT ${CASA_CODE_PATH} )
+if ( EXISTS ${CASA_CODE_PATH}/include/alma )
+   set( ASDM_INCLUDE_ROOT ${CASA_CODE_PATH}/include )
+endif()
+#set( ASDM_INCLUDE_DIR_OLD ${ASDM_INCLUDE_ROOT}/alma/ASDM
+#                          ${ASDM_INCLUDE_ROOT}/alma/Enumerations
+#                          ${ASDM_INCLUDE_ROOT}/alma/ASDMBinaries
+#                          ${ASDM_INCLUDE_ROOT}/alma/Enumtcl
 #                          ${LIBXML2_INCLUDE_DIR} )
 #set( ASDM_LIBRARY_OLD ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX} 
 #                      ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
-#set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma_v3/ASDM
-#                      ${CASA_CODE_PATH}/alma_v3/Enumerations
-#                      ${CASA_CODE_PATH}/alma_v3/ASDMBinaries
-#                      ${CASA_CODE_PATH}/alma_v3/Enumtcl
+#set( ASDM_INCLUDE_DIR ${ASDM_INCLUDE_ROOT}/alma_v3/ASDM
+#                      ${ASDM_INCLUDE_ROOT}/alma_v3/Enumerations
+#                      ${ASDM_INCLUDE_ROOT}/alma_v3/ASDMBinaries
+#                      ${ASDM_INCLUDE_ROOT}/alma_v3/Enumtcl
 #                      ${LIBXML2_INCLUDE_DIR} )
 #set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma_v3${CMAKE_SHARED_LIBRARY_SUFFIX}
 #                  ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
-set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma/ASDM
-                      ${CASA_CODE_PATH}/alma/Enumerations
-                      ${CASA_CODE_PATH}/alma/ASDMBinaries
-                      ${CASA_CODE_PATH}/alma/Enumtcl
+set( ASDM_INCLUDE_DIR ${ASDM_INCLUDE_ROOT}/alma/ASDM
+                      ${ASDM_INCLUDE_ROOT}/alma/Enumerations
+                      ${ASDM_INCLUDE_ROOT}/alma/ASDMBinaries
+                      ${ASDM_INCLUDE_ROOT}/alma/Enumtcl
                       ${LIBXML2_INCLUDE_DIR} )
 if ( NOT ALMA_LIB_PATH )