summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-11-06 14:25:34 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-11-06 14:25:43 (GMT)
commitef86e8991b6b9b2d4b25f98a95ba950f9ba19485 (patch)
treec3c126119ab76925135f66f0eb3c4fe190448250
parentbae7a82ffab7350ae55a104d85d91b5d36347cae (diff)
parent77a01c398f20bf41921d73082f469acf6c9e0acf (diff)
downloadCMake-ef86e8991b6b9b2d4b25f98a95ba950f9ba19485.zip
CMake-ef86e8991b6b9b2d4b25f98a95ba950f9ba19485.tar.gz
CMake-ef86e8991b6b9b2d4b25f98a95ba950f9ba19485.tar.bz2
Merge topic 'FindBoost-meta-component-ALL' into release-3.16
77a01c398f FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3996
-rw-r--r--Modules/FindBoost.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 744d2c7..ef962bc 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()