Changeset 2573 for trunk/cmake

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:

• 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/implement/ASDM
-#                          ${CASA_CODE_PATH}/alma/implement/Enumerations
-#                          ${CASA_CODE_PATH}/alma/implement/ASDMBinaries
-#                          ${CASA_CODE_PATH}/alma/implement/Enumtcl
+#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
 #                          ${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/implement/ASDM
-#                      ${CASA_CODE_PATH}/alma_v3/implement/Enumerations
-#                      ${CASA_CODE_PATH}/alma_v3/implement/ASDMBinaries
-#                      ${CASA_CODE_PATH}/alma_v3/implement/Enumtcl
+#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
 #                      ${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/implement/ASDM
-                      ${CASA_CODE_PATH}/alma/implement/Enumerations
-                      ${CASA_CODE_PATH}/alma/implement/ASDMBinaries
-                      ${CASA_CODE_PATH}/alma/implement/Enumtcl
+set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma/ASDM
+                      ${CASA_CODE_PATH}/alma/Enumerations
+                      ${CASA_CODE_PATH}/alma/ASDMBinaries
+                      ${CASA_CODE_PATH}/alma/Enumtcl
                       ${LIBXML2_INCLUDE_DIR} )
 if ( NOT ALMA_LIB_PATH )