Changeset 3040 for trunk/cmake

Timestamp:

07/15/15 11:50:06 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/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...

Support build on OS X 10.9 and 10.10.

File:

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

trunk/cmake/withcasa.cmake

@@ -6 +6 @@
 # environment dependent settings
 if( APPLE )
-   if( CMAKE_SYSTEM MATCHES ^Darwin-10 OR
-        CMAKE_SYSTEM MATCHES ^Darwin-11 OR
-        CMAKE_SYSTEM MATCHES ^Darwin-12 )
+   if ( CMAKE_SYSTEM MATCHES ^Darwin-1[0-4] )
+      message( STATUS "This is OS X" )
+      if ( CMAKE_SYSTEM MATCHES ^Darwin-1[34] )
+         set( arch darwin )
+      endif()
       if ( NOT arch )
          set( arch darwin64 )
@@ -30 +32 @@
       endif()
       if( archflag STREQUAL x86_64 )
-         if( CMAKE_SYSTEM MATCHES ^Darwin-12 )
+         if( CMAKE_SYSTEM MATCHES ^Darwin-1[2-4] )
              if ( EXISTS /opt/casa/01 )
                  set( casa_packages /opt/casa/01 )
@@ -72 +74 @@
 endif()
 message( STATUS "arch = " ${arch} )
+message( STATUS "casa_packages = " ${casa_packages} )
 
 # install directory