diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-02 11:53:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-02 11:53:22 (GMT) |
| commit | 08da4f8d70cce97a9a6913d74e6c128ca6c0a40b (patch) | |
| tree | 08ca4f84f9ca8c997f4d20912783ca908f4cb9ac | |
| parent | bacb20a3364e6a868cc47720f4a5c9831103af42 (diff) | |
| parent | 9855a80fd41e384bc3accd07fa8b98f7da7d916d (diff) | |
| download | CMake-08da4f8d70cce97a9a6913d74e6c128ca6c0a40b.zip CMake-08da4f8d70cce97a9a6913d74e6c128ca6c0a40b.tar.gz CMake-08da4f8d70cce97a9a6913d74e6c128ca6c0a40b.tar.bz2 | |
Merge topic 'FindBoost-exact-version'
9855a80fd4 FindBoost: search default path if Boost_FIND_VERSION_EXACT
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2543
| -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 4cae8cb..23f636e 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -1264,7 +1264,7 @@ if(NOT Boost_INCLUDE_DIR) list(APPEND _boost_INCLUDE_SEARCH_DIRS NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) else() if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") - foreach(ver ${_Boost_KNOWN_VERSIONS}) + foreach(ver ${_boost_TEST_VERSIONS}) string(REPLACE "." "_" ver "${ver}") list(APPEND _boost_INCLUDE_SEARCH_DIRS PATHS "C:/local/boost_${ver}") endforeach() @@ -1582,7 +1582,7 @@ foreach(c DEBUG RELEASE) if( Boost_NO_SYSTEM_PATHS ) list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) else() - foreach(ver ${_Boost_KNOWN_VERSIONS}) + foreach(ver ${_boost_TEST_VERSIONS}) string(REPLACE "." "_" ver "${ver}") _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "C:/local/boost_${ver}") endforeach() |