diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-22 10:36:20 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-10-22 10:42:33 -0400 |
| commit | 4b2a61946fdb77ab37b66b1d2b81d2d77453ca5d (patch) | |
| tree | e54fb02ab8ae3a27ce2ba7b6bc8fb6cf54b49a01 /Modules/FindBoost.cmake | |
| parent | b32cb33275ecafe7465d30a46ce63a7fc25904f8 (diff) | |
| download | cmake-4b2a61946fdb77ab37b66b1d2b81d2d77453ca5d.tar.gz | |
FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig
Fixes: #21200
Diffstat (limited to 'Modules/FindBoost.cmake')
| -rw-r--r-- | Modules/FindBoost.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index f27666de5f..77868f4bb9 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -450,7 +450,13 @@ if (NOT Boost_NO_BOOST_CMAKE) # Do the same find_package call but look specifically for the CMake version. # Note that args are passed in the Boost_FIND_xxxxx variables, so there is no # need to delegate them to this find_package call. + cmake_policy(PUSH) + if(BOOST_ROOT AND NOT Boost_ROOT) + cmake_policy(SET CMP0074 NEW) + set(Boost_ROOT "${BOOST_ROOT}") + endif() find_package(Boost QUIET NO_MODULE ${_boost_FIND_PACKAGE_ARGS}) + cmake_policy(POP) if (DEFINED Boost_DIR) mark_as_advanced(Boost_DIR) endif () |