diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-02 14:43:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-02 14:43:33 (GMT) |
| commit | fa60d56c870eedda04f88c1c519dbb2955c8795c (patch) | |
| tree | b23e0cd7ec851bc2a27a26ef4680bcc047789dc4 | |
| parent | 89310efa4aa82213a5fd74917b565a2819ed2b0f (diff) | |
| parent | 685fa8bec064e5776319c8a42c02578bd85b6a7d (diff) | |
| download | CMake-fa60d56c870eedda04f88c1c519dbb2955c8795c.zip CMake-fa60d56c870eedda04f88c1c519dbb2955c8795c.tar.gz CMake-fa60d56c870eedda04f88c1c519dbb2955c8795c.tar.bz2 | |
Merge topic 'FindBoost-config-mode'
685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5445
| -rw-r--r-- | Modules/FindBoost.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 77868f4..00e4ff1 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -450,13 +450,19 @@ 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) + # Honor BOOST_ROOT by setting Boost_ROOT with CMP0074 NEW behavior. + cmake_policy(PUSH) cmake_policy(SET CMP0074 NEW) set(Boost_ROOT "${BOOST_ROOT}") + set(_Boost_ROOT_FOR_CONFIG 1) endif() find_package(Boost QUIET NO_MODULE ${_boost_FIND_PACKAGE_ARGS}) - cmake_policy(POP) + if(_Boost_ROOT_FOR_CONFIG) + unset(_Boost_ROOT_FOR_CONFIG) + unset(Boost_ROOT) + cmake_policy(POP) + endif() if (DEFINED Boost_DIR) mark_as_advanced(Boost_DIR) endif () |