Changeset 1956


Ignore:
Timestamp:
03/15/12 15:22:38 (2 years ago)
Author:
wjbohnh
Message:

Added Boost_INCLUDE_DIR to the list of include directories.
Formerly, used Boost_INCLUDE_DIRS (plural) only, but I recently encountered
a case (RHEL5/intel compiler with Boost-1.49) in which the non-plural version
of the CMake variable was necessary.

Also, ensured that UTILIB_HAVE_BOOST is true when BOOST_ROOT is specified
via environment variable.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r1955 r1956  
    6666set(UTILIB_HAVE_BOOST 0) 
    6767if(HAVE_BOOST) 
    68   if(NOT Boost_DIR) 
     68 
     69  if(Boost_DIR) 
     70    message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
     71    set(UTILIB_HAVE_BOOST 1)  
     72    include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
     73  else() 
    6974    find_package(Boost COMPONENTS signals) 
    7075    if(Boost_FOUND) 
     
    7277      include_directories(${Boost_INCLUDE_DIRS}) 
    7378    endif() 
    74   else() 
    75     #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
    76   endif() 
     79  endif(Boost_DIR) 
     80 
    7781endif(HAVE_BOOST) 
    7882 
Note: See TracChangeset for help on using the changeset viewer.