Changeset 2400 for trunk/cmake

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

File:

• trunk/cmake/withcasa.cmake (modified) (2 diffs)

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 )