From f5b2ec5d8fd7ce754b0a94d62d0e074269fbb0b5 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 3 Dec 2019 11:50:40 +0800 Subject: [PATCH] cmake: do not use CMP0093 unless it is supported CMake CMP0093 was introduced by CMake 3.15, but we only require CMake v3.10.2. so use the old `Boost_VERSION_MACRO` variable by default, unless specified otherwise. Signed-off-by: Kefu Chai --- cmake/modules/FindBoost.cmake | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake index f96b2056bbd5..b24e135b8936 100644 --- a/cmake/modules/FindBoost.cmake +++ b/cmake/modules/FindBoost.cmake @@ -1649,15 +1649,17 @@ if(Boost_INCLUDE_DIR) set(Boost_VERSION_STRING "${Boost_VERSION_MAJOR}.${Boost_VERSION_MINOR}.${Boost_VERSION_PATCH}") # Define final Boost_VERSION - cmake_policy(GET CMP0093 _Boost_CMP0093 - PARENT_SCOPE # undocumented, do not use outside of CMake - ) - if("x${_Boost_CMP0093}x" STREQUAL "xNEWx") - set(Boost_VERSION ${Boost_VERSION_STRING}) + if(POLICY CMP0093) + cmake_policy(GET CMP0093 _Boost_CMP0093) + if("x${_Boost_CMP0093}x" STREQUAL "xNEWx") + set(Boost_VERSION ${Boost_VERSION_STRING}) + else() + set(Boost_VERSION ${Boost_VERSION_MACRO}) + endif() + unset(_Boost_CMP0093) else() set(Boost_VERSION ${Boost_VERSION_MACRO}) endif() - unset(_Boost_CMP0093) _Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}" "${CMAKE_CURRENT_LIST_LINE}" "Boost_VERSION") _Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}" "${CMAKE_CURRENT_LIST_LINE}" "Boost_VERSION_STRING") -- 2.47.3