Changes in trunk/CMakeLists.txt [2465:2298]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r2465 r2298 15 15 message( STATUS "USE_LIBCASACORE = " ${USE_LIBCASACORE} ) 16 16 message( STATUS "STANDALONE = " ${STANDALONE} ) 17 18 # Use casapy's fork of casacore19 if ( NOT STANDALONE )20 add_definitions( -DUSE_CASAPY )21 endif ()22 17 23 18 # Define compiler paths on OSX 10.5. This must be done before invoking project() … … 47 42 # default is RelWithDebInfo 48 43 # 49 50 51 44 if ( NOT CMAKE_BUILD_TYPE ) 52 45 set( CMAKE_BUILD_TYPE RelWithDebInfo ) … … 93 86 if( APPLE ) 94 87 set( SO dylib ) 95 if( CMAKE_SYSTEM MATCHES ^Darwin-10 OR 96 CMAKE_SYSTEM MATCHES ^Darwin-11 ) 88 if( CMAKE_SYSTEM MATCHES ^Darwin-10 ) 97 89 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 ) 101 91 set( archflag x86_64 ) 102 92 elseif( EXISTS /opt/casa/core2-apple-darwin10 ) … … 274 264 -DPYVERSION=${PV} ) 275 265 else() 276 # with CASA277 266 if( NOT PYTHON_FOUND ) 278 267 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 ) 282 269 # (The library named libpython.2.5.2.dylib seems to exist only in the CASA world.) 283 270 else() … … 289 276 290 277 casa_find( 291 PYTHON${_v} 292 #PREFIX_HINTS ${PYTHON_ROOT_DIR} 278 PYTHON${_v} 293 279 LIBS python${_v} 294 280 NO_REQUIRE … … 326 312 # Python library was not in a lib(64) directory! 327 313 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 Lion333 #334 if( APPLE )335 314 set( python_prefix ${casa_packages} ) 336 315 endif() … … 606 585 # libraries and executables 607 586 # 608 set( ASAPPYLIB _asap )609 587 set( ASAPLIB asap ) 610 588 set( PYRAPLIB pyrap ) … … 612 590 set( ASAP2TO3 asap2to3 ) 613 591 if ( NOT STANDALONE ) 614 #set( ASDM2ASAP_OLD oldasdm2ASAP )592 set( ASDM2ASAP_OLD oldasdm2ASAP ) 615 593 set( ASDM2ASAP asdm2ASAP ) 616 594 endif()
Note:
See TracChangeset
for help on using the changeset viewer.