summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-11-07 09:31:59 -0500
committerBrad King <brad.king@kitware.com>2019-11-07 09:31:59 -0500
commit61ce9d17697db65d179b348845e07f7649818d65 (patch)
tree49fb2718da99ddb3b11f4b5eaf7ca4b410596a0d
parent4011b1be41e97de3f1c1cee741f0627838913974 (diff)
parent0faeb6a4282f476eb5873b7a1e6d60760a06c3bd (diff)
downloadcmake-61ce9d17697db65d179b348845e07f7649818d65.tar.gz
Merge branch 'backport-FindBoost-meta-component-ALL' into release-3.15
Merge-request: !4008
-rw-r--r--Modules/FindBoost.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 078000f228..af4947caee 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -449,6 +449,9 @@ if (NOT Boost_NO_BOOST_CMAKE)
# Convert component found variables to standard variables if required
# Necessary for legacy boost-cmake and 1.70 builtin BoostConfig
if(Boost_FIND_COMPONENTS)
+ # Ignore the meta-component "ALL", introduced by Boost 1.73
+ list(REMOVE_ITEM Boost_FIND_COMPONENTS "ALL")
+
foreach(_comp IN LISTS Boost_FIND_COMPONENTS)
if(DEFINED Boost_${_comp}_FOUND)
continue()