Changeset 2931 for trunk

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.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/withcasa.cmake (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -470 +470 @@
     "int main() { return 0; }\n"
     )
-  
+
+  execute_process( COMMAND ${CMAKE_Fortran_COMPILER} -print-search-dirs
+                   COMMAND perl -e "$found = 0; while(<>) {  s|\n||g; if( m|^libraries:\\s*=(.*?$)| ) { foreach $d (split(':',$1) ) { if ( -e \"$d/libgfortran${CMAKE_SHARED_LIBRARY_SUFFIX}\" ) { print \"$d/libgfortran${CMAKE_SHARED_LIBRARY_SUFFIX}\"; $found = 1; break; }} break if $found; } break if $found;}"
+                   OUTPUT_VARIABLE _gfortran_lib_path
+                   OUTPUT_STRIP_TRAILING_WHITESPACE )
+
   if( _gfortran_lib_path )
     try_compile( _have_gfortran ${CMAKE_BINARY_DIR} ${_try}

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 )