From e1e3935f5d93687040738943bccdd53b6926f9ae Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Tue, 14 May 2019 20:10:22 +0200 Subject: FindBoost: Remove obsolete diagnostic message about Boost_ROOT CMake 3.12 introduced _ROOT CMake and environment variables to be valid hints to find_package(). Defining Boost_ROOT is no longer wrong if CMP0074 is set to NEW. Fixes #18810 --- Modules/FindBoost.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) -- cgit v0.12