Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r2465 r2298  
    1515message( STATUS "USE_LIBCASACORE = " ${USE_LIBCASACORE} )
    1616message( STATUS "STANDALONE = " ${STANDALONE} )
    17 
    18 # Use casapy's fork of casacore 
    19 if ( NOT STANDALONE )
    20   add_definitions( -DUSE_CASAPY )
    21 endif ()
    2217
    2318# Define compiler paths on OSX 10.5. This must be done before invoking project()
     
    4742# default is RelWithDebInfo
    4843#
    49 
    50 
    5144if ( NOT CMAKE_BUILD_TYPE )
    5245   set( CMAKE_BUILD_TYPE RelWithDebInfo )
     
    9386if( APPLE )
    9487   set( SO dylib )
    95    if( CMAKE_SYSTEM MATCHES ^Darwin-10 OR
    96                 CMAKE_SYSTEM MATCHES ^Darwin-11 )
     88   if( CMAKE_SYSTEM MATCHES ^Darwin-10 )
    9789      if( NOT archflag )
    98          if( EXISTS /opt/casa/darwin11 )
    99             set( archflag x86_64 )
    100          elseif( EXISTS /opt/casa/darwin10-64b )
     90         if( EXISTS /opt/casa/darwin10-64b )
    10191            set( archflag x86_64 )
    10292         elseif( EXISTS /opt/casa/core2-apple-darwin10 )
     
    274264      -DPYVERSION=${PV} )
    275265else()
    276    # with CASA
    277266   if( NOT PYTHON_FOUND )
    278267      if ( NOT PYTHON_LIBNAME )
    279          #set( _names 2.9 2.8 2.7 2.6 2.5.2 2.5 )
    280          set( _names 2.6 2.5.2 2.5 )
    281          # OSX 10.7 has Python2.7 by default. CASA has't yet supported python > 2.6 anyway.
     268         set( _names 2.9 2.8 2.7 2.6 2.5.2 2.5 )
    282269         # (The library named libpython.2.5.2.dylib seems to exist only in the CASA world.)
    283270      else()
     
    289276
    290277         casa_find(
    291             PYTHON${_v}
    292             #PREFIX_HINTS ${PYTHON_ROOT_DIR}
     278            PYTHON${_v}
    293279            LIBS python${_v}
    294280            NO_REQUIRE
     
    326312      # Python library was not in a lib(64) directory!
    327313      message( WARNING "Python library path \"${PYTHON${PYTHON_LIBNAME}_LIBRARIES}\" does not contain \"/lib(64)/lib${python_library}\"" )
    328       set( python_prefix ${casa_packages} )
    329    endif()
    330 
    331    #
    332    # For some unknown reason cmake sets the /usr for Lion
    333    #
    334    if( APPLE )
    335314      set( python_prefix ${casa_packages} )
    336315   endif()
     
    606585# libraries and executables
    607586#
    608 set( ASAPPYLIB _asap )
    609587set( ASAPLIB asap )
    610588set( PYRAPLIB pyrap )
     
    612590set( ASAP2TO3 asap2to3 )
    613591if ( NOT STANDALONE )
    614 #   set( ASDM2ASAP_OLD oldasdm2ASAP )
     592   set( ASDM2ASAP_OLD oldasdm2ASAP )
    615593   set( ASDM2ASAP asdm2ASAP )
    616594endif()
Note: See TracChangeset for help on using the changeset viewer.