Changeset 1956

Timestamp:

12/06/10 12:09:11 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2668

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...

Introduced USE_LIBCASACORE switch to enable to choose casacore libraries
to be built with ASAP (libcasacore.so or libcasa_casa.so etc.).
Default is not use libcasacore.so library.

File:

• trunk/CMakeLists.txt (modified) (1 diff)

trunk/CMakeLists.txt

@@ -90 +90 @@
 # casacore
 #
-set( CASACORE_INCLUDE_DIR ${casaroot}/${arch}/include/casacore )
-
-set( CASACORE_LIBS casa
-                   components
-                   coordinates
-                   fits
-                   images
-                   lattices
-                   measures
-                   mirlib
-                   ms
-                   msfits
-                   scimath
-                   scimath_f
-                   tables )
-set( _casacore_libs "" )
-foreach( _a ${CASACORE_LIBS} )
-   set( _libname libcasa_${_a}.${SO} )
-   unset( _casacore_lib CACHE )
-   find_library( _casacore_lib ${_libname}
-                 PATHS ${CMAKE_INSTALL_PREFIX} PATH_SUFFIXES lib )
-   if( NOT _casacore_lib-NOTFOUND )
-      list( APPEND _casacore_libs casa_${_a} )
-   endif()
-endforeach()
-set( CASACORE_LIBRARIES ${_casacore_libs} )
+if( NOT USE_LIBCASACORE )
+   # use casacore libraries 
+   set( _includename aipsdef.h )
+   find_path( CASACORE_INCPATH ${_includename} 
+              HINTS ${casaroot}/${arch}/include/
+              PATH_SUFFIXES casacore/casa ) 
+   if( CASACORE_INCPATH STREQUAL CASACORE_INCPATH-NOTFOUND )
+     message( FATAL_ERROR "${_includename} could not be found. Please check!" )
+   else()
+      string( REGEX REPLACE /[^/]+/?$ "" CASACORE_INCLUDE_DIR ${CASACORE_INCPATH} )  
+   endif()
+   set( CASACORE_LIBS casa
+                      components
+                      coordinates
+                      fits
+                      images
+                      lattices
+                      measures
+                      mirlib
+                      ms
+                      msfits
+                      scimath
+                      scimath_f
+                      tables )
+   set( _casacore_libs "" )
+   foreach( _a ${CASACORE_LIBS} )
+      set( _libname libcasa_${_a}.${SO} )
+      unset( _casacore_lib CACHE )
+      find_library( _casacore_lib ${_libname}
+                    PATHS ${CMAKE_INSTALL_PREFIX} PATH_SUFFIXES lib )
+      if( NOT _casacore_lib-NOTFOUND )
+         list( APPEND _casacore_libs casa_${_a} )
+      endif()
+   endforeach()
+   set( CASACORE_LIBRARIES ${_casacore_libs} )
+else()
+   # use libcasacore
+   set( _libname libcasacore.${SO} )
+   find_library( CASACORE_LIBRARIES ${_libname} )
+   if( CASACORE_LIBRARIES STREQUAL CASACORE_LIBRARIES-NOTFOUND )
+      message( FATAL_ERROR "${_libname} could not be found. Please check!" )
+   endif()
+   set( _includename aipsdef.h )
+   find_path( CASACORE_INCPATH ${_includename} 
+              PATH_SUFFIXES casacore/casa ) 
+   if( CASACORE_INCPATH STREQUAL CASACORE_INCPATH-NOTFOUND )
+     message( FATAL_ERROR "${_includename} could not be found. Please check!" )
+   else()
+      string( REGEX REPLACE /[^/]+/?$ "" CASACORE_INCLUDE_DIR ${CASACORE_INCPATH} )
+   endif()
+endif()
 message( STATUS "CASACORE_LIBRARIES = " ${CASACORE_LIBRARIES} )
+message( STATUS "CASACORE_INCLUDE_DIR = " ${CASACORE_INCLUDE_DIR} )
 
 #