Changeset 2893 for trunk/cmake

Timestamp:

01/20/14 21:00:50 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: make on OSX 10.8

Put in Release Notes: No

Module(s): asap with casa

Description: Updated CMake file for OSX 10.8.

File:

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

trunk/cmake/withcasa.cmake

@@ -7 +7 @@
 if( APPLE )
    if( CMAKE_SYSTEM MATCHES ^Darwin-10 OR
-                CMAKE_SYSTEM MATCHES ^Darwin-11 )
+                CMAKE_SYSTEM MATCHES ^Darwin-11 OR
+                CMAKE_SYSTEM MATCHES ^Darwin-12 )
       if ( NOT arch )
          set( arch darwin64 )
       endif()
       if( NOT archflag )
-         if( EXISTS /opt/casa/darwin11 )
+         if( EXISTS /opt/casa/darwin12 )
+            set( archflag x86_64 )
+         elseif( EXISTS /opt/casa/darwin11 )
             set( archflag x86_64 )
          elseif( EXISTS /opt/casa/darwin10-64b )
@@ -23 +26 @@
       endif()
       if( archflag STREQUAL x86_64 )
-         if( CMAKE_SYSTEM MATCHES ^Darwin-11 )
+         if( CMAKE_SYSTEM MATCHES ^Darwin-12 )
+             set( casa_packages /opt/local )
+         elseif( CMAKE_SYSTEM MATCHES ^Darwin-11 )
              set( casa_packages /opt/casa/darwin11 )
          else()