Changeset 2400

Timestamp:

01/20/12 19:04:16 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: build asap

Put in Release Notes: No

Module(s): asap

Description: Added cmake definitions to build asap on OSX 10.7 Lion

Location:

trunk

Files:

• CMakeLists.txt (modified) (4 diffs)
• cmake/withcasa.cmake (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -86 +86 @@
 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 +267 @@
       -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 +282 @@
 
          casa_find( 
-            PYTHON${_v} 
+            PYTHON${_v}
+            #PREFIX_HINTS ${PYTHON_ROOT_DIR}
             LIBS python${_v} 
             NO_REQUIRE 
@@ -312 +319 @@
       # 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()

trunk/cmake/withcasa.cmake

@@ -6 +6 @@
 # environment dependent settings
 if( APPLE )
-   if( CMAKE_SYSTEM MATCHES ^Darwin-10 )
+   if( CMAKE_SYSTEM MATCHES ^Darwin-10 OR
+                CMAKE_SYSTEM MATCHES ^Darwin-11 )
       if ( NOT arch )
          set( arch darwin64 )
       endif()
       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 )
@@ -20 +23 @@
       endif()
       if( archflag STREQUAL x86_64 )
-         set( casa_packages /opt/casa/darwin10-64b )
+         if( CMAKE_SYSTEM MATCHES ^Darwin-11 )
+             set( casa_packages /opt/casa/darwin11 )
+         else()
+             set( casa_packages /opt/casa/darwin10-64b )
+         endif()
       else()
          set( casa_packages /opt/casa/core2-apple-darwin10 )