diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-28 14:26:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-28 14:26:00 (GMT) |
| commit | c752f8f165e9b8db7bc645cc55301277cd7773be (patch) | |
| tree | c01ce71a12d59062be62810ab60ce58028718654 | |
| parent | f1ac5ba5e8881d1cb88bdc94f2b3064c1007440b (diff) | |
| parent | 43b8bfb213188b1017949b5c29f3071e455121e3 (diff) | |
| download | CMake-c752f8f165e9b8db7bc645cc55301277cd7773be.zip CMake-c752f8f165e9b8db7bc645cc55301277cd7773be.tar.gz CMake-c752f8f165e9b8db7bc645cc55301277cd7773be.tar.bz2 | |
Merge topic 'find-boost-no-reroot'
43b8bfb2 FindBoost: fix find_library call when using "re-rooting"
| -rw-r--r-- | Modules/FindBoost.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 3642b3e..aad6575 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -321,7 +321,7 @@ macro(_Boost_FIND_LIBRARY var) # If Boost_LIBRARY_DIR is known then search only there. 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() endmacro() @@ -855,7 +855,7 @@ if(_Boost_CHANGE_LIBDIR AND NOT _Boost_LIBRARY_DIR_CHANGED) endif() 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() set(_boost_LIBRARY_SEARCH_DIRS "") if(BOOST_LIBRARYDIR) |