diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-03 14:16:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-03 14:16:57 (GMT) |
| commit | c212b5b02517559dcda611cc7a59519542e1ce6d (patch) | |
| tree | 5fd2d01d358ae9efb4c27d94d6dc67821482890b | |
| parent | a0d31f3bb3e6c2c6329a6947e038d6f1c3303475 (diff) | |
| parent | 5a9b2b3b116a401b752a7a48c0bcae56eb2bf89b (diff) | |
| download | CMake-c212b5b02517559dcda611cc7a59519542e1ce6d.zip CMake-c212b5b02517559dcda611cc7a59519542e1ce6d.tar.gz CMake-c212b5b02517559dcda611cc7a59519542e1ce6d.tar.bz2 | |
Merge topic 'FindBoost-no-system-env-paths'
5a9b2b3b FindBoost: Fix Boost_NO_SYSTEM_PATHS to not consider environment (#15702)
| -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 38ccf78..3d573b8 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -982,7 +982,7 @@ if(NOT Boost_INCLUDE_DIR) endif() if( Boost_NO_SYSTEM_PATHS) - list(APPEND _boost_INCLUDE_SEARCH_DIRS NO_CMAKE_SYSTEM_PATH) + list(APPEND _boost_INCLUDE_SEARCH_DIRS NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) else() list(APPEND _boost_INCLUDE_SEARCH_DIRS PATHS C:/boost/include @@ -1251,7 +1251,7 @@ foreach(c DEBUG RELEASE) ${Boost_INCLUDE_DIR}/stage/lib ) if( Boost_NO_SYSTEM_PATHS ) - list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH) + list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) else() list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} PATHS C:/boost/lib |