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

Merge topic 'find-boost-no-reroot' 

43b8bfb2 FindBoost: fix find_library call when using "re-rooting"
This commit is contained in:
Brad King 2014-10-28 10:26:00 -04:00 committed by CMake Topic Stage
parent f1ac5ba5e8 43b8bfb213
commit c752f8f165
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindBoost.cmake
View File

@ -321,7 +321,7 @@ macro(_Boost_FIND_LIBRARY var)
# If Boost_LIBRARY_DIR is known then search only there. # If Boost_LIBRARY_DIR is known then search only there.
if(Boost_LIBRARY_DIR) if(Boost_LIBRARY_DIR)
set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH) set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
endif() endif()
endmacro() endmacro()
@ -855,7 +855,7 @@ if(_Boost_CHANGE_LIBDIR AND NOT _Boost_LIBRARY_DIR_CHANGED)
endif() endif()
if(Boost_LIBRARY_DIR) if(Boost_LIBRARY_DIR)
set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH) set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
else() else()
set(_boost_LIBRARY_SEARCH_DIRS "") set(_boost_LIBRARY_SEARCH_DIRS "")
if(BOOST_LIBRARYDIR) if(BOOST_LIBRARYDIR)