Changes in trunk/CMakeLists.txt [2298:2465]

File:

• trunk/CMakeLists.txt (modified) (8 diffs)

trunk/CMakeLists.txt

@@ -15 +15 @@
 message( STATUS "USE_LIBCASACORE = " ${USE_LIBCASACORE} )
 message( STATUS "STANDALONE = " ${STANDALONE} )
+
+# Use casapy's fork of casacore  
+if ( NOT STANDALONE )
+  add_definitions( -DUSE_CASAPY )
+endif ()
 
 # Define compiler paths on OSX 10.5. This must be done before invoking project()
@@ -42 +47 @@
 # default is RelWithDebInfo
 #
+
+
 if ( NOT CMAKE_BUILD_TYPE )
    set( CMAKE_BUILD_TYPE RelWithDebInfo )
@@ -86 +93 @@
 if( APPLE )
    set( SO dylib )
-   if( CMAKE_SYSTEM MATCHES ^Darwin-10 )
+   if( CMAKE_SYSTEM MATCHES ^Darwin-10 OR
+                CMAKE_SYSTEM MATCHES ^Darwin-11 )
       if( NOT archflag )
-         if( EXISTS /opt/casa/darwin10-64b )
+         if( EXISTS /opt/casa/darwin11 )
+            set( archflag x86_64 )
+         elseif( EXISTS /opt/casa/darwin10-64b )
             set( archflag x86_64 )
          elseif( EXISTS /opt/casa/core2-apple-darwin10 )
@@ -264 +274 @@
       -DPYVERSION=${PV} )
 else()
+   # with CASA
    if( NOT PYTHON_FOUND )
       if ( NOT PYTHON_LIBNAME )
-         set( _names 2.9 2.8 2.7 2.6 2.5.2 2.5 )
+         #set( _names 2.9 2.8 2.7 2.6 2.5.2 2.5 )
+         set( _names 2.6 2.5.2 2.5 )
+         # OSX 10.7 has Python2.7 by default. CASA has't yet supported python > 2.6 anyway.
          # (The library named libpython.2.5.2.dylib seems to exist only in the CASA world.)
       else()
@@ -276 +289 @@
 
          casa_find( 
-            PYTHON${_v} 
+            PYTHON${_v}
+            #PREFIX_HINTS ${PYTHON_ROOT_DIR}
             LIBS python${_v} 
             NO_REQUIRE 
@@ -312 +326 @@
       # Python library was not in a lib(64) directory!
       message( WARNING "Python library path \"${PYTHON${PYTHON_LIBNAME}_LIBRARIES}\" does not contain \"/lib(64)/lib${python_library}\"" )
+      set( python_prefix ${casa_packages} )
+   endif()
+
+   #
+   # For some unknown reason cmake sets the /usr for Lion
+   #
+   if( APPLE )
       set( python_prefix ${casa_packages} )
    endif()
@@ -585 +606 @@
 # libraries and executables
 #
+set( ASAPPYLIB _asap )
 set( ASAPLIB asap )
 set( PYRAPLIB pyrap )
@@ -590 +612 @@
 set( ASAP2TO3 asap2to3 )
 if ( NOT STANDALONE )
-   set( ASDM2ASAP_OLD oldasdm2ASAP )
+#   set( ASDM2ASAP_OLD oldasdm2ASAP )
    set( ASDM2ASAP asdm2ASAP )
 endif()