Changeset 3006 for trunk/CMakeLists.txt

Timestamp:

10/16/14 12:52:07 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): cmake build scripts

Description: Applied a patch sent from Darrell on Sep. 12, 2014 to support building on the latest version of OSX.

File:

• trunk/CMakeLists.txt (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -98 +98 @@
                 CMAKE_SYSTEM MATCHES ^Darwin-11 )
       if( NOT archflag )
-         if( EXISTS /opt/casa/darwin11 )
+         if( EXISTS /opt/casa/01 )
+            set( archflag x86_64 )
+         elseif( EXISTS /opt/casa/darwin11 )
             set( archflag x86_64 )
          elseif( EXISTS /opt/casa/darwin10-64b )
@@ -189 +191 @@
    set( CASACORE_LIBS casa
                       coordinates
+                      components
                       fits
                       images