Changeset 2847

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:

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

trunk/CMakeLists.txt

@@ -281 +281 @@
       if ( NOT PYTHON_LIBNAME )
          #set( _names 2.9 2.8 2.7 2.6 2.5.2 2.5 )
-         set( _names 2.6 2.5.2 2.5 )
+         set( _names 2.7 2.6 2.5.2 2.5 )
          # OSX 10.7 has Python2.7 by default. CASA has't yet supported python > 2.6 anyway.
          # (The library named libpython.2.5.2.dylib seems to exist only in the CASA world.)

trunk/cmake/withcasa.cmake

@@ -39 +39 @@
 elseif( CMAKE_SYSTEM_NAME STREQUAL Linux )
    if( CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 )
-      set( casa_packages /usr/lib64/casapy )
+      if ( EXISTS /usr/lib64/casa/01 )
+         set( casa_packages /usr/lib64/casa/01 )
+      else( )
+          set( casa_packages /usr/lib64/casapy )
+      endif( )
       if( NOT arch )
          set( arch linux_64b )