Changeset 3107 for trunk


Ignore:
Timestamp:
11/08/16 18:25:12 (7 years ago)
Author:
Kana Sugimoto
Message:

New Development: Yes

JIRA Issue: Yes (CAS-9275)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: build cmake

Put in Release Notes: No

Module(s): asap

Description: Darrell's changes to support thirdparty at /opt/casa/02.


Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3106 r3107  
    348348         casa_find(
    349349            PYTHON${_v}
    350             #PREFIX_HINTS ${PYTHON_ROOT_DIR}
     350            PREFIX_HINTS ${PYTHON_ROOT_DIR}
    351351            LIBS python${_v}
    352352            NO_REQUIRE
     
    405405      INCLUDES_SUFFIXES python${PYTHONV}
    406406      PREFIX_HINTS
     407         ${PYTHON_ROOT_DIR}
    407408         ${NUMPY_ROOT_DIR}
    408409         ${python_prefix}/lib/python${PYTHONV}/site-packages/numpy/core
     
    653654set( _wcs_version 4.3 )
    654655find_library( WCSLIB ${_wcslib}
    655               PATHS ${WCSLIB_PATHS}
     656              PATHS ${WCSLIB_ROOT_DIR} ${WCSLIB_PATHS}
    656657              PATH_SUFFIXES lib64 lib )
    657658if( WCSLIB MATCHES "NOTFOUND$" )
     
    661662   set( _wcslib libwcs.${_wcs_version}.${SO} )
    662663   message( STATUS "Try to find ${_wcslib}..." )
     664   message( STATUS "looking in ${WCSLIB_PATHS}..." )
    663665   find_library( WCSLIB ${_wcslib}
    664                  PATHS ${WCSLIB_PATHS}
     666                 PATHS ${WCSLIB_ROOT_DIR} ${WCSLIB_PATHS}
    665667                 PATH_SUFFIXES lib64 lib )
    666668   if( WCSLIB MATCHES "NOTFOUND$" )
     
    670672message( STATUS "WCSLIB = " ${WCSLIB} )
    671673find_path( WCSLIB_INCLUDE_DIR wcslib/wcs.h
    672            PATHS ${WCSLIB_PATHS}
     674           PATHS ${WCSLIB_ROOT_DIR} ${WCSLIB_PATHS}
    673675           PATH_SUFFIXES include )
    674676if( WCSLIB_INCLUDE_DIR MATCHES "NOTFOUND$" )
     
    699701set( PYTHON_INSTALL_DIR python/${PYTHONV}/asap )
    700702set( SHARED_INSTALL_DIR share/asap )
     703if( NOT STANDALONE )
     704   if( EXISTS ${CMAKE_INSTALL_PREFIX}/python${PYTHONV} )
     705      message( STATUS "adjusting PYTHON_INSTALL_DIR to python${PYTHONV}/asap" )
     706      set( PYTHON_INSTALL_DIR python${PYTHONV}/asap )
     707   endif()
     708endif()
    701709
    702710#
  • trunk/cmake/withcasa.cmake

    r3055 r3107  
    5858elseif( CMAKE_SYSTEM_NAME STREQUAL Linux )
    5959   if( CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 )
    60       if ( EXISTS /usr/lib64/casa/01 )
     60      if ( EXISTS /usr/lib64/casa/02 )
     61         set( casa_packages /opt/casa/02 )
     62      elseif ( EXISTS /usr/lib64/casa/01 )
    6163         set( casa_packages /usr/lib64/casa/01 )
    6264      else( )
Note: See TracChangeset for help on using the changeset viewer.