Changeset 2210

Timestamp:

07/06/11 17:28:38 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1913

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Update CMakeLists.txt to build asdm2ASAP.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/withcasa.cmake (modified) (3 diffs)

trunk/CMakeLists.txt

@@ -543 +543 @@
 set( ATNFLIB atnf )
 set( ASAP2TO3 asap2to3 )
+if ( NOT STANDALONE )
+   set( ASDM2ASAP asdm2ASAP )
+endif()
 
 #

trunk/cmake/withcasa.cmake

@@ -72 +72 @@
 message( STATUS "CASA_CODE_PATH = " ${CASA_CODE_PATH} )
 set( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CASA_CODE_PATH}/install" )
-#unset( CASA_CODE_PATH CACHE )
 message( STATUS "CMAKE_MODULE_PATH = " ${CMAKE_MODULE_PATH} )
 
@@ -99 +98 @@
 
 #
+# CASA (only alma/ASDM)
+#
+find_path( LIBXML2_INCLUDE_DIR libxml/xmlversion.h 
+           PATH_SUFFIXES libxml2 )
+if( LIBXML2_INCLUDE_DIR MATCHES "NOTFOUND$" )
+   message( FATAL_ERROR "libxml/xmlversion.h could not be found. Please check!" )
+endif()
+message( STATUS "LIBXML2_INCLUDE_DIR = " ${LIBXML2_INCLUDE_DIR} )
+find_path( LIBXML2_LIBRARY libxml2.so
+           PATHS /usr
+           PATH_SUFFIXES lib64 lib )
+#find_path( LIBXML2_LIBRARY libxml2.so )
+if ( LIBXML2_LIBRARY MATCHES "NOTFOUND$" )
+   message( FATAL_ERROR "libxml2.so could not be found. Please check!" ) 
+endif()
+message( STATUS "LIBXML2_LIBRARY = " ${LIBXML2_LIBRARY} ) 
+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
+                      ${LIBXML2_INCLUDE_DIR} )
+set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma.so
+                  ${LIBXML2_LIBRARY}/libxml2.so )
+add_definitions( -DWITHOUT_ACS )
+
+#
 # subdirectories
 #  ASAP2TO3 asap2to3       apps
@@ -114 +139 @@
    add_subdirectory( python )
    add_subdirectory( share )
+   add_subdirectory( external-alma/asdm2ASAP ) 
 endmacro( asap_add_subdirectory )