Changeset 2931 for trunk/cmake

Timestamp:

04/21/14 15:53:23 (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): asap build

Description: Committing changes to CMake scripts received from Darrell. This contains changes to enable building ASAP with llvm-gfortran. The changes do NOT affect build of stand-alone ASAP.

File:

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

trunk/cmake/withcasa.cmake

@@ -21 +21 @@
          elseif( EXISTS /opt/casa/core2-apple-darwin10 )
             set( archflag i386 )
+         elseif( EXISTS /opt/casa/01 )
+            set( archflag x86_64 )
          else()
             set( archflag x86_64 )
@@ -29 +31 @@
              set( casa_packages /opt/local )
          elseif( CMAKE_SYSTEM MATCHES ^Darwin-11 )
-             set( casa_packages /opt/casa/darwin11 )
+             if ( EXISTS /opt/casa/01 )
+                 set( casa_packages /opt/casa/01 )
+             else()
+                 set( casa_packages /opt/casa/darwin11 )
+             endif()
          else()
              set( casa_packages /opt/casa/darwin10-64b )