summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-05-16 14:20:51 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-05-16 14:21:02 (GMT)
commit9fdad3a601e529e07c23d34cab8279747e11054e (patch)
tree6e74358530846efecc40011135819ec242fa1977
parent62b0d14e24907f1b234d18035c3a44b94b32c808 (diff)
parente1e3935f5d93687040738943bccdd53b6926f9ae (diff)
downloadCMake-9fdad3a601e529e07c23d34cab8279747e11054e.zip
CMake-9fdad3a601e529e07c23d34cab8279747e11054e.tar.gz
CMake-9fdad3a601e529e07c23d34cab8279747e11054e.tar.bz2
Merge topic 'FindBoost-allow-root'
e1e3935f5d FindBoost: Remove obsolete diagnostic message about Boost_ROOT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3323
-rw-r--r--Modules/FindBoost.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 23549cb..018f675 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1265,7 +1265,11 @@ if(WIN32)
INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
endif()
-_Boost_CHECK_SPELLING(Boost_ROOT)
+cmake_policy(GET CMP0074 _Boost_CMP0074)
+if(NOT "x${_Boost_CMP0074}x" STREQUAL "xNEWx")
+ _Boost_CHECK_SPELLING(Boost_ROOT)
+endif()
+unset(_Boost_CMP0074)
_Boost_CHECK_SPELLING(Boost_LIBRARYDIR)
_Boost_CHECK_SPELLING(Boost_INCLUDEDIR)