Changeset 3107 for trunk

Timestamp:

11/08/16 18:25:12 (8 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:

• CMakeLists.txt (modified) (6 diffs)
• cmake/withcasa.cmake (modified) (1 diff)

trunk/CMakeLists.txt

@@ -348 +348 @@
          casa_find(
             PYTHON${_v}
-            #PREFIX_HINTS ${PYTHON_ROOT_DIR}
+            PREFIX_HINTS ${PYTHON_ROOT_DIR}
             LIBS python${_v}
             NO_REQUIRE
@@ -405 +405 @@
       INCLUDES_SUFFIXES python${PYTHONV}
       PREFIX_HINTS
+         ${PYTHON_ROOT_DIR}
          ${NUMPY_ROOT_DIR}
          ${python_prefix}/lib/python${PYTHONV}/site-packages/numpy/core
@@ -653 +654 @@
 set( _wcs_version 4.3 )
 find_library( WCSLIB ${_wcslib} 
-              PATHS ${WCSLIB_PATHS} 
+              PATHS ${WCSLIB_ROOT_DIR} ${WCSLIB_PATHS} 
               PATH_SUFFIXES lib64 lib )
 if( WCSLIB MATCHES "NOTFOUND$" )
@@ -661 +662 @@
    set( _wcslib libwcs.${_wcs_version}.${SO} )
    message( STATUS "Try to find ${_wcslib}..." )
+   message( STATUS "looking in ${WCSLIB_PATHS}..." )
    find_library( WCSLIB ${_wcslib}
-                 PATHS ${WCSLIB_PATHS}
+                 PATHS ${WCSLIB_ROOT_DIR} ${WCSLIB_PATHS}
                  PATH_SUFFIXES lib64 lib )
    if( WCSLIB MATCHES "NOTFOUND$" )
@@ -670 +672 @@
 message( STATUS "WCSLIB = " ${WCSLIB} )
 find_path( WCSLIB_INCLUDE_DIR wcslib/wcs.h
-           PATHS ${WCSLIB_PATHS}
+           PATHS ${WCSLIB_ROOT_DIR} ${WCSLIB_PATHS}
            PATH_SUFFIXES include )
 if( WCSLIB_INCLUDE_DIR MATCHES "NOTFOUND$" )
@@ -699 +701 @@
 set( PYTHON_INSTALL_DIR python/${PYTHONV}/asap )
 set( SHARED_INSTALL_DIR share/asap )
+if( NOT STANDALONE )
+   if( EXISTS ${CMAKE_INSTALL_PREFIX}/python${PYTHONV} )
+      message( STATUS "adjusting PYTHON_INSTALL_DIR to python${PYTHONV}/asap" )
+      set( PYTHON_INSTALL_DIR python${PYTHONV}/asap )
+   endif()
+endif()
 
 #

trunk/cmake/withcasa.cmake

@@ -58 +58 @@
 elseif( CMAKE_SYSTEM_NAME STREQUAL Linux )
    if( CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 )
-      if ( EXISTS /usr/lib64/casa/01 )
+      if ( EXISTS /usr/lib64/casa/02 )
+         set( casa_packages /opt/casa/02 )
+      elseif ( EXISTS /usr/lib64/casa/01 )
          set( casa_packages /usr/lib64/casa/01 )
       else( )