Changeset 1958

Timestamp:

12/07/10 19:56:51 (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...

Update for Mac OS X.

Location:

trunk

Files:

• CMakeLists.txt (modified) (10 diffs)
• src/CMakeLists.txt (modified) (1 diff)

trunk/CMakeLists.txt

@@ -5 +5 @@
 # minimum requirement for cmake version
 cmake_minimum_required( VERSION 2.8 )
+
+# Define compiler paths on OSX 10.5. This must be done before invoking project()
+if( APPLE )
+    if( EXISTS            /opt/casa/core2-apple-darwin8/3rd-party/bin/gfortran )
+    set( SO dylib )
+        set( CMAKE_Fortran_COMPILER /opt/casa/core2-apple-darwin8/3rd-party/bin/gfortran )
+        set( CMAKE_CXX_COMPILER     /opt/casa/core2-apple-darwin8/3rd-party/bin/g++ )
+    elseif( EXISTS        /opt/local/bin/gfortran )
+        set( CMAKE_Fortran_COMPILER /opt/local/bin/gfortran )
+    elseif( EXISTS        /opt/local/bin/gfortran-mp-4.4 )
+        set( CMAKE_Fortran_COMPILER /opt/local/bin/gfortran-mp-4.4 )
+        if( EXISTS /opt/local/bin/g++-mp-4.4 )
+            set( CMAKE_CXX_COMPILER /opt/local/bin/g++-mp-4.4 )
+        endif()
+    endif()
+endif()
 
 # project name is ASAP
@@ -33 +49 @@
 
 # environment dependent settings
+message( STATUS "CMAKE_SYSTEM = " ${CMAKE_SYSTEM} )
 if( APPLE )
    set( SO dylib )
@@ -38 +55 @@
       set( arch darwin )
    endif()
-   if( CMAKE_SYSTEM MATHCES ^Darwin-10 )
+   if( CMAKE_SYSTEM MATCHES ^Darwin-10 )
       if( NOT archflag )
          if( EXISTS /opt/casa/darwin10-64b )
@@ -92 +109 @@
 set( CMAKE_CXX_FLAGS ${DEFAULT_CXX_FLAGS} )
 
+# DL
+set( DL_LIBRARIES ${CMAKE_DL_LIBS} CACHE STRING "dl libraries" FORCE )
+if( DL_LIBRARIES STREQUAL "dl" )
+  set( DL_LIBRARIES "-ldl" CACHE STRING "dl libraries" FORCE )
+endif()
+message( STATUS "DL_LIBRARIES = " ${DL_LIBRARIES} )
 
 #
@@ -98 +121 @@
 if( NOT USE_LIBCASACORE )
    # use casacore libraries 
-   set( _includename aipsdef.h )
-   find_path( CASACORE_INCPATH ${_includename} 
+   set( _includename casa/aipsdef.h )
+   find_path( CASACORE_INCLUDE_DIR ${_includename} 
               HINTS ${casaroot}/${arch}/include/
-              PATH_SUFFIXES casacore/casa ) 
-   if( CASACORE_INCPATH STREQUAL CASACORE_INCPATH-NOTFOUND )
+              PATH_SUFFIXES casacore ) 
+   if( CASACORE_INCLUDE_DIR STREQUAL CASACORE_INCLUDE_DIR-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
@@ -127 +148 @@
                     PATHS ${CMAKE_INSTALL_PREFIX} PATH_SUFFIXES lib )
       if( NOT _casacore_lib-NOTFOUND )
-         list( APPEND _casacore_libs casa_${_a} )
+         #list( APPEND _casacore_libs casa_${_a} )
+         list( APPEND _casacore_libs ${_casacore_lib} )
       endif()
    endforeach()
@@ -138 +160 @@
       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 )
+   set( _includename casa/aipsdef.h )
+   find_path( CASACORE_INCLUDE_DIR ${_includename} 
+              PATH_SUFFIXES casacore ) 
+   if( CASACORE_INCLUDE_DIR STREQUAL CASACORE_INCLUDE_DIR-NOTFOUND )
      message( FATAL_ERROR "${_includename} could not be found. Please check!" )
-   else()
-      string( REGEX REPLACE /[^/]+/?$ "" CASACORE_INCLUDE_DIR ${CASACORE_INCPATH} )
    endif()
 endif()
@@ -279 +299 @@
 #
 set( _wcslib libwcs.${SO} )
+set( _wcs_version 4.3 )
 find_library( WCSLIB ${_wcslib} 
               HINTS /usr/lib64 /usr/lib ${casaroot}/${arch}/lib )
 if( WCSLIB STREQUAL WCSLIB-NOTFOUND )
-   message( FATAL_ERROR "${_wcslib} could not be found. Please check!" )
+   message( STATUS "${_wcslib} could not be found." )
+   unset( _wcslib CACHE )
+   unset( WCSLIB CACHE ) 
+   set( _wcslib libwcs.${_wcs_version}.${SO} )
+   message( STATUS "Try to find ${_wcslib}..." )
+   find_library( WCSLIB ${_wcslib} 
+                 HINTS /usr/lib64 /usr/lib ${casaroot}/${arch}/lib )
+   if( WCSLIB STREQUAL WCSLIB-NOTFOUND )
+      message( FATAL_ERROR "${_wcslib} could not be found. Please check!" )
+   endif()
 endif()
 message( STATUS "WCSLIB = " ${WCSLIB} )
+find_path( WCSLIB_INCLUDE_DIR wcslib/wcs.h
+           HINTS /usr/include ${casaroot}/${arch}/include )
+if( WCSLIB_INCLUDE_DIR STREQUAL WCSLIB_INCLUDE_DIR-NOTFOUND )
+   message( FATAL_ERROR "wcs.h could not be found. Please check!" )
+endif()
+message( STATUS "WCSLIB_INCLUDE_DIR = " ${WCSLIB_INCLUDE_DIR} )
 
 
@@ -353 +389 @@
 include_directories( ${CASACORE_INCLUDE_DIR} 
                      ${Boost_INCLUDE_DIR} 
-                     ${PYTHON_INCLUDE_DIR} )
+                     ${PYTHON_INCLUDE_DIR} 
+                     ${WCSLIB_INCLUDE_DIR} )
+message( STATUS "WCSLIB = " ${WCSLIB} )
 
 #
 # link path
 #
-set( CASACORE_LIBRARY_DIR ${casaroot}/${arch}/lib )
-link_directories( ${CASACORE_LIBRARY_DIR} )
+#set( CASACORE_LIBRARY_DIR ${casaroot}/${arch}/lib )
+#link_directories( ${CASACORE_LIBRARY_DIR} )
 
 
@@ -374 +412 @@
 # libraries and executables
 #
-set( ASAPLIB _asap )
+set( ASAPLIB asap )
 set( PYRAPLIB pyrap )
 set( ATNFLIB atnf )

trunk/src/CMakeLists.txt

@@ -79 +79 @@
 set_target_properties( ${ASAPLIB}
                        PROPERTIES
-                       PREFIX "" )
+                       PREFIX _
+                       SUFFIX .so )
 
 target_link_libraries( ${ASAPLIB} 
-                       ${Boost_LIBRARIES}
+                       #${Boost_LIBRARIES}
                        ${PYRAPLIB} 
                        ${ATNFLIB} 
-                       ${CASACORE_LIBRARIES} 
+                       #${CASACORE_LIBRARIES} 
                        ${WCSLIB} )