Changes in trunk/cmake/withcasa.cmake [2400:2273]

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 OR
-                CMAKE_SYSTEM MATCHES ^Darwin-11 )
-      if ( NOT arch )
-         set( arch darwin64 )
-      endif()
+   if( NOT arch )
+      set( arch darwin )
+   endif()
+   if( CMAKE_SYSTEM MATCHES ^Darwin-10 )
       if( NOT archflag )
-         if( EXISTS /opt/casa/darwin11 )
-            set( archflag x86_64 )
-         elseif( EXISTS /opt/casa/darwin10-64b )
+         if( EXISTS /opt/casa/darwin10-64b )
             set( archflag x86_64 )
          elseif( EXISTS /opt/casa/core2-apple-darwin10 )
@@ -23 +20 @@
       endif()
       if( archflag STREQUAL x86_64 )
-         if( CMAKE_SYSTEM MATCHES ^Darwin-11 )
-             set( casa_packages /opt/casa/darwin11 )
-         else()
-             set( casa_packages /opt/casa/darwin10-64b )
-         endif()
+         set( casa_packages /opt/casa/darwin10-64b )
       else()
          set( casa_packages /opt/casa/core2-apple-darwin10 )
       endif()
    elseif( CMAKE_SYSTEM MATCHES ^Darwin-9 )
-      if ( NOT arch )
-         set( arch darwin )
-      endif()
       set( casa_packages /opt/casa/core2-apple-darwin8/3rd-party )
    endif()