Changeset 2399 for trunk

Timestamp:

01/13/12 19:47:39 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-3665

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

CMakeLists.txt is updated mainly for Mac.

• library name for asap library is still _asap.so (not .dylib)
• architecture name is always 'darwin64' when OS version is 10.6 or later
• make symbolic link to $CASAROOT/$CASAARCH/python/2.6/asap/_asap.so and place it to $CASAROOT/$CASAARCH/lib

Location:

trunk

Files:

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

trunk/cmake/withcasa.cmake

@@ -6 +6 @@
 # environment dependent settings
 if( APPLE )
-   if( NOT arch )
-      set( arch darwin )
-   endif()
    if( CMAKE_SYSTEM MATCHES ^Darwin-10 )
+      if ( NOT arch )
+         set( arch darwin64 )
+      endif()
       if( NOT archflag )
          if( EXISTS /opt/casa/darwin10-64b )
@@ -25 +25 @@
       endif()
    elseif( CMAKE_SYSTEM MATCHES ^Darwin-9 )
+      if ( NOT arch )
+         set( arch darwin )
+      endif()
       set( casa_packages /opt/casa/core2-apple-darwin8/3rd-party )
    endif()         

trunk/src/CMakeLists.txt

@@ -105 +105 @@
 if( NOT STANDALONE )
   execute_process(
-    COMMAND ln -Fs ../${PYTHON_INSTALL_DIR}/_asap.so ${CMAKE_INSTALL_PREFIX}/lib/_asap.so
+    COMMAND ln -Fs ../${PYTHON_INSTALL_DIR}/_${ASAPLIB}.so ${CMAKE_INSTALL_PREFIX}/lib/_${ASAPLIB}.so
     OUTPUT_VARIABLE stuff)
 endif()