Changeset 2399


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/cmake/withcasa.cmake

    r2273 r2399  
    66# environment dependent settings
    77if( APPLE )
    8    if( NOT arch )
    9       set( arch darwin )
    10    endif()
    118   if( CMAKE_SYSTEM MATCHES ^Darwin-10 )
     9      if ( NOT arch )
     10         set( arch darwin64 )
     11      endif()
    1212      if( NOT archflag )
    1313         if( EXISTS /opt/casa/darwin10-64b )
     
    2525      endif()
    2626   elseif( CMAKE_SYSTEM MATCHES ^Darwin-9 )
     27      if ( NOT arch )
     28         set( arch darwin )
     29      endif()
    2730      set( casa_packages /opt/casa/core2-apple-darwin8/3rd-party )
    2831   endif()         
  • trunk/src/CMakeLists.txt

    r2393 r2399  
    105105if( NOT STANDALONE )
    106106  execute_process(
    107     COMMAND ln -Fs ../${PYTHON_INSTALL_DIR}/_asap.so ${CMAKE_INSTALL_PREFIX}/lib/_asap.so
     107    COMMAND ln -Fs ../${PYTHON_INSTALL_DIR}/_${ASAPLIB}.so ${CMAKE_INSTALL_PREFIX}/lib/_${ASAPLIB}.so
    108108    OUTPUT_VARIABLE stuff)
    109109endif()
Note: See TracChangeset for help on using the changeset viewer.