Changeset 1971

Timestamp:

12/16/10 16:56:08 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2668

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on standalone build.

File:

• trunk/CMakeLists.txt (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -200 +200 @@
    string( REGEX MATCH [0-9].[0-9] PYTHONV ${PYTHON_INCLUDE_DIRS} )
    string( REPLACE "." "" PV ${PYTHONV} )
-   set( PYTHON_PREFIX ${PYTHON_INCLUDE_DIRS}/../.. )
    find_path( NUMPY_INCLUDE_DIR numpy/npy_interrupt.h 
               PATHS 
-                 ${PYTHON_PREFIX}/lib/python${PYTHONV}/site-packages/numpy/core 
-                 ${PYTHON_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYTHONV} 
-                 ${PYTHON_PREFIX}/Library/Frameworks/Python.framework/Versions/${PYTHONV}/lib/python${PYTHONV}/site-packages/numpy/core 
+                 ${pyroot}/lib/python${PYTHONV}/site-packages/numpy/core 
+                 ${pyroot}/Library/Frameworks/Python.framework/Versions/${PYTHONV} 
+                 ${pyroot}/Library/Frameworks/Python.framework/Versions/${PYTHONV}/lib/python${PYTHONV}/site-packages/numpy/core 
               PATH_SUFFIXES include )
    if( NUMPY_INCLUDE_DIR MATCHES "NOTFOUND$" )
@@ -354 +353 @@
    if( CFITSIO_INCLUDE_DIRS MATCHES "NOTFOUND$" )
       message( FATAL_ERROR "fitsio.h could not be found. Please check!" )
+   endif()
+   string( REGEX REPLACE "/[^/]+/?$" "" CFITSIO_ROOT ${CFITSIO_INCLUDE_DIRS} )
+   message( STATUS "CFITSIO_ROOT=" ${CFITSIO_ROOT} )
+   find_library( CFITSIO_LIBRARIES libcfitsio.${SO}
+                 PATHS ${CFITSIO_ROOT}
+                 PATH_SUFFIXES lib64 lib
+                 NO_DEFAULT_PATH )
+   if( CFITSIO_LIBRARIES MATCHES "NOTFOUND$" )
+      find_library( CFITSIO_LIBRARIES libcfitsio.a 
+                    PATHS ${CFITSIO_ROOT}
+                    PATH_SUFFIXES lib64 lib
+                    NO_DEFAULT_PATH )
    endif()
    find_library( CFITSIO_LIBRARIES libcfitsio.${SO}