Changeset 1962

Timestamp:

12/10/10 17:03:47 (13 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 that causes loss of include path when rebuilding.
Use cached include path (${package}_INCLUDE_DIRS) instead of
uncashed one (${package}_INCLUDE_DIR) for python and rpfits.

File:

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

trunk/CMakeLists.txt

@@ -283 +283 @@
 string( REGEX REPLACE "/[^/]+/[^/]+/?$" "" pyroot ${PYTHON_Python.h} )
 
-message( STATUS "PYTHON_INCLUDE_DIR = " ${PYTHON_INCLUDE_DIR} )
+message( STATUS "PYTHON_INCLUDE_DIRS = " ${PYTHON_INCLUDE_DIRS} )
 message( STATUS "PYTHON_LINRARIES = " ${PYTHON_LIBRARIES} )
 message( STATUS "PYTHONV = " ${PYTHONV} )
@@ -413 +413 @@
    message( FATAL_ERROR "${_wcslib} could not be found. Please check!" )
 endif()
-message( STATUS "RPFITS_INCLUDE_DIR = " ${RPFITS_INCLUDE_DIR} )
+message( STATUS "RPFITS_INCLUDE_DIRS = " ${RPFITS_INCLUDE_DIRS} )
 message( STATUS "RPFITS_LIBRARIES = " ${RPFITS_LIBRARIES} )
 
@@ -420 +420 @@
 # common include path
 #
-message( STATUS "Boost_INCLUDE_DIR = " ${Boost_INCLUDE_DIR} )
 include_directories( ${CASACORE_INCLUDE_DIR} 
                      ${Boost_INCLUDE_DIR} 
-                     ${PYTHON_INCLUDE_DIR} 
+                     ${PYTHON_INCLUDE_DIRS} 
                      ${WCSLIB_INCLUDE_DIR} 
                      ${CFITSIO_INCLUDE_DIRS} 
-                     ${RPFITS_INCLUDE_DIR} )
-
-#
-# link path
-#
-#set( CASACORE_LIBRARY_DIR ${casaroot}/${arch}/lib )
-#link_directories( ${CASACORE_LIBRARY_DIR} )
+                     ${RPFITS_INCLUDE_DIRS} )