Changeset 2931 for trunk


Ignore:
Timestamp:
04/21/14 15:53:23 (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r2847 r2931  
    470470    "int main() { return 0; }\n"
    471471    )
    472  
     472
     473  execute_process( COMMAND ${CMAKE_Fortran_COMPILER} -print-search-dirs
     474                   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;}"
     475                   OUTPUT_VARIABLE _gfortran_lib_path
     476                   OUTPUT_STRIP_TRAILING_WHITESPACE )
     477
    473478  if( _gfortran_lib_path )
    474479    try_compile( _have_gfortran ${CMAKE_BINARY_DIR} ${_try}
  • trunk/cmake/withcasa.cmake

    r2898 r2931  
    2121         elseif( EXISTS /opt/casa/core2-apple-darwin10 )
    2222            set( archflag i386 )
     23         elseif( EXISTS /opt/casa/01 )
     24            set( archflag x86_64 )
    2325         else()
    2426            set( archflag x86_64 )
     
    2931             set( casa_packages /opt/local )
    3032         elseif( CMAKE_SYSTEM MATCHES ^Darwin-11 )
    31              set( casa_packages /opt/casa/darwin11 )
     33             if ( EXISTS /opt/casa/01 )
     34                 set( casa_packages /opt/casa/01 )
     35             else()
     36                 set( casa_packages /opt/casa/darwin11 )
     37             endif()
    3238         else()
    3339             set( casa_packages /opt/casa/darwin10-64b )
Note: See TracChangeset for help on using the changeset viewer.