From b32cb33275ecafe7465d30a46ce63a7fc25904f8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Oct 2020 10:29:51 -0400 Subject: FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfig Issue: #21200 --- Modules/FindBoost.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 6154dd6..f27666d 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -442,10 +442,15 @@ if (NOT Boost_NO_BOOST_CMAKE) endif() endif() + set(_boost_FIND_PACKAGE_ARGS "") + if(Boost_NO_SYSTEM_PATHS) + list(APPEND _boost_FIND_PACKAGE_ARGS NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) + endif() + # 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. - find_package(Boost QUIET NO_MODULE) + find_package(Boost QUIET NO_MODULE ${_boost_FIND_PACKAGE_ARGS}) if (DEFINED Boost_DIR) mark_as_advanced(Boost_DIR) endif () -- cgit v0.12