kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FindBoost.cmake: Fix library search path glitch introduced in earlier commit

This commit is contained in:
Philip Lowman 2010-09-19 23:15:07 -04:00
parent 90c16d84be
commit b8b9a32170
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Modules/FindBoost.cmake
View File

@ -499,7 +499,7 @@ ELSE (_boost_IN_CACHE)
"-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define") "-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define")
ENDIF(WIN32) ENDIF(WIN32)
SET(_boost_INCLUDE_SEARCH_DIRS set(_boost_INCLUDE_SEARCH_DIRS_SYSTEM
C:/boost/include C:/boost/include
C:/boost C:/boost
"$ENV{ProgramFiles}/boost/include" "$ENV{ProgramFiles}/boost/include"
@ -551,19 +551,18 @@ ELSE (_boost_IN_CACHE)
"_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}") "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
endif() endif()
if( Boost_NO_SYSTEM_PATHS)
set(_boost_FIND_OPTIONS NO_CMAKE_SYSTEM_PATH)
else()
set(_boost_INCLUDE_SEARCH_DIRS ${_boost_INCLUDE_SEARCH_DIRS_SYSTEM})
endif()
if( BOOST_ROOT ) if( BOOST_ROOT )
if( Boost_NO_SYSTEM_PATHS ) set(_boost_INCLUDE_SEARCH_DIRS
set(_boost_INCLUDE_SEARCH_DIRS ${BOOST_ROOT}/include
${BOOST_ROOT}/include ${BOOST_ROOT}
${BOOST_ROOT}) ${_boost_INCLUDE_SEARCH_DIRS})
set(_boost_FIND_OPTIONS NO_CMAKE_SYSTEM_PATH) endif()
else()
set(_boost_INCLUDE_SEARCH_DIRS
${BOOST_ROOT}/include
${BOOST_ROOT}
${_boost_INCLUDE_SEARCH_DIRS})
endif()
endif( BOOST_ROOT )
# prepend BOOST_INCLUDEDIR to search path if specified # prepend BOOST_INCLUDEDIR to search path if specified
if( BOOST_INCLUDEDIR ) if( BOOST_INCLUDEDIR )
@ -803,9 +802,13 @@ ELSE (_boost_IN_CACHE)
# Begin finding boost libraries # Begin finding boost libraries
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
if(BOOST_ROOT)
set(_boost_LIBRARY_SEARCH_DIRS_ALWAYS
${BOOST_ROOT}/lib
${BOOST_ROOT}/stage/lib)
endif()
set(_boost_LIBRARY_SEARCH_DIRS_ALWAYS set(_boost_LIBRARY_SEARCH_DIRS_ALWAYS
${BOOST_ROOT}/lib ${_boost_LIBRARY_SEARCH_DIRS_ALWAYS}
${BOOST_ROOT}/stage/lib
${Boost_INCLUDE_DIR}/lib ${Boost_INCLUDE_DIR}/lib
${Boost_INCLUDE_DIR}/../lib ${Boost_INCLUDE_DIR}/../lib
${Boost_INCLUDE_DIR}/stage/lib ${Boost_INCLUDE_DIR}/stage/lib
@ -819,14 +822,12 @@ ELSE (_boost_IN_CACHE)
"$ENV{ProgramFiles}/boost" "$ENV{ProgramFiles}/boost"
/sw/local/lib /sw/local/lib
) )
if( BOOST_ROOT ) set(_boost_LIBRARY_SEARCH_DIRS ${_boost_LIBRARY_SEARCH_DIRS_ALWAYS})
set(_boost_LIBRARY_SEARCH_DIRS ${_boost_LIBRARY_SEARCH_DIRS_ALWAYS}) if( Boost_NO_SYSTEM_PATHS )
if( Boost_NO_SYSTEM_PATHS ) set(_boost_FIND_OPTIONS NO_CMAKE_SYSTEM_PATH)
set(_boost_FIND_OPTIONS NO_CMAKE_SYSTEM_PATH) else()
else() list(APPEND _boost_LIBRARY_SEARCH_DIRS ${_boost_LIBRARY_SEARCH_DIRS_SYSTEM})
list(APPEND _boost_LIBRARY_SEARCH_DIRS ${_boost_LIBRARY_SEARCH_DIRS_SYSTEM}) endif()
endif()
endif( BOOST_ROOT )
# prepend BOOST_LIBRARYDIR to search path if specified # prepend BOOST_LIBRARYDIR to search path if specified
if( BOOST_LIBRARYDIR ) if( BOOST_LIBRARYDIR )