Changeset 2847


Ignore:
Timestamp:
09/05/13 12:06:01 (11 years ago)
Author:
Kana Sugimoto
Message:

New Development: Yes

JIRA Issue: probably

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asap build using Cmake

Description:

Applied a patch passed from Darrell for build on new third-party library configurations of CASA.

  • support of python 2.7.5
  • searching new third-party library location when built with CASA.

These changes do NOT affect build of stand-alone ASAP.


Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r2833 r2847  
    281281      if ( NOT PYTHON_LIBNAME )
    282282         #set( _names 2.9 2.8 2.7 2.6 2.5.2 2.5 )
    283          set( _names 2.6 2.5.2 2.5 )
     283         set( _names 2.7 2.6 2.5.2 2.5 )
    284284         # OSX 10.7 has Python2.7 by default. CASA has't yet supported python > 2.6 anyway.
    285285         # (The library named libpython.2.5.2.dylib seems to exist only in the CASA world.)
  • trunk/cmake/withcasa.cmake

    r2578 r2847  
    3939elseif( CMAKE_SYSTEM_NAME STREQUAL Linux )
    4040   if( CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 )
    41       set( casa_packages /usr/lib64/casapy )
     41      if ( EXISTS /usr/lib64/casa/01 )
     42         set( casa_packages /usr/lib64/casa/01 )
     43      else( )
     44          set( casa_packages /usr/lib64/casapy )
     45      endif( )
    4246      if( NOT arch )
    4347         set( arch linux_64b )
Note: See TracChangeset for help on using the changeset viewer.