Changeset 1962 for trunk


Ignore:
Timestamp:
12/10/10 17:03:47 (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 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r1961 r1962  
    283283string( REGEX REPLACE "/[^/]+/[^/]+/?$" "" pyroot ${PYTHON_Python.h} )
    284284
    285 message( STATUS "PYTHON_INCLUDE_DIR = " ${PYTHON_INCLUDE_DIR} )
     285message( STATUS "PYTHON_INCLUDE_DIRS = " ${PYTHON_INCLUDE_DIRS} )
    286286message( STATUS "PYTHON_LINRARIES = " ${PYTHON_LIBRARIES} )
    287287message( STATUS "PYTHONV = " ${PYTHONV} )
     
    413413   message( FATAL_ERROR "${_wcslib} could not be found. Please check!" )
    414414endif()
    415 message( STATUS "RPFITS_INCLUDE_DIR = " ${RPFITS_INCLUDE_DIR} )
     415message( STATUS "RPFITS_INCLUDE_DIRS = " ${RPFITS_INCLUDE_DIRS} )
    416416message( STATUS "RPFITS_LIBRARIES = " ${RPFITS_LIBRARIES} )
    417417
     
    420420# common include path
    421421#
    422 message( STATUS "Boost_INCLUDE_DIR = " ${Boost_INCLUDE_DIR} )
    423422include_directories( ${CASACORE_INCLUDE_DIR}
    424423                     ${Boost_INCLUDE_DIR}
    425                      ${PYTHON_INCLUDE_DIR}
     424                     ${PYTHON_INCLUDE_DIRS}
    426425                     ${WCSLIB_INCLUDE_DIR}
    427426                     ${CFITSIO_INCLUDE_DIRS}
    428                      ${RPFITS_INCLUDE_DIR} )
    429 
    430 #
    431 # link path
    432 #
    433 #set( CASACORE_LIBRARY_DIR ${casaroot}/${arch}/lib )
    434 #link_directories( ${CASACORE_LIBRARY_DIR} )
     427                     ${RPFITS_INCLUDE_DIRS} )
    435428
    436429
Note: See TracChangeset for help on using the changeset viewer.