From dd0cdb3eb6cffc8cc0bb5d4ba0a54fd67c5bfd3a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 3 Dec 2019 09:50:10 +0800 Subject: [PATCH] cmake: do not use CMP0074 unless it is supported CMake CMP0074 was introduced by CMake 3.12, but we only require CMake v3.10.2. so default to check `Boost_ROOT` unless specified otherwise. Signed-off-by: Kefu Chai --- cmake/modules/FindBoost.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake index ebe18e3bc58..f96b2056bbd 100644 --- a/cmake/modules/FindBoost.cmake +++ b/cmake/modules/FindBoost.cmake @@ -1492,11 +1492,15 @@ if(WIN32) INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") endif() -cmake_policy(GET CMP0074 _Boost_CMP0074) -if(NOT "x${_Boost_CMP0074}x" STREQUAL "xNEWx") +if(POLICY CMP0074) + cmake_policy(GET CMP0074 _Boost_CMP0074) + if(NOT "x${_Boost_CMP0074}x" STREQUAL "xNEWx") + _Boost_CHECK_SPELLING(Boost_ROOT) + endif() + unset(_Boost_CMP0074) +else() _Boost_CHECK_SPELLING(Boost_ROOT) endif() -unset(_Boost_CMP0074) _Boost_CHECK_SPELLING(Boost_LIBRARYDIR) _Boost_CHECK_SPELLING(Boost_INCLUDEDIR)