Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r2400 r2298  
    8686if( APPLE )
    8787   set( SO dylib )
    88    if( CMAKE_SYSTEM MATCHES ^Darwin-10 OR
    89                 CMAKE_SYSTEM MATCHES ^Darwin-11 )
     88   if( CMAKE_SYSTEM MATCHES ^Darwin-10 )
    9089      if( NOT archflag )
    91          if( EXISTS /opt/casa/darwin11 )
    92             set( archflag x86_64 )
    93          elseif( EXISTS /opt/casa/darwin10-64b )
     90         if( EXISTS /opt/casa/darwin10-64b )
    9491            set( archflag x86_64 )
    9592         elseif( EXISTS /opt/casa/core2-apple-darwin10 )
     
    267264      -DPYVERSION=${PV} )
    268265else()
    269    # with CASA
    270266   if( NOT PYTHON_FOUND )
    271267      if ( NOT PYTHON_LIBNAME )
    272          #set( _names 2.9 2.8 2.7 2.6 2.5.2 2.5 )
    273          set( _names 2.6 2.5.2 2.5 )
    274          # 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 )
    275269         # (The library named libpython.2.5.2.dylib seems to exist only in the CASA world.)
    276270      else()
     
    282276
    283277         casa_find(
    284             PYTHON${_v}
    285             #PREFIX_HINTS ${PYTHON_ROOT_DIR}
     278            PYTHON${_v}
    286279            LIBS python${_v}
    287280            NO_REQUIRE
     
    319312      # Python library was not in a lib(64) directory!
    320313      message( WARNING "Python library path \"${PYTHON${PYTHON_LIBNAME}_LIBRARIES}\" does not contain \"/lib(64)/lib${python_library}\"" )
    321       set( python_prefix ${casa_packages} )
    322    endif()
    323 
    324    #
    325    # For some unknown reason cmake sets the /usr for Lion
    326    #
    327    if( APPLE )
    328314      set( python_prefix ${casa_packages} )
    329315   endif()
Note: See TracChangeset for help on using the changeset viewer.