From 33138aa909302740af4995faffe5d5454db0097c Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 27 May 2021 11:04:21 +0100 Subject: [PATCH] Another cmakelists fix Forwarded: no Last-Update: 2021-01-08 This fixes the last Boost 1.74 compatibility problems. Gbp-Pq: Name another-cmakelists-fix.patch --- CMakeLists.txt | 3 +++ src/rgw/CMakeLists.txt | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d03fe93f8..da9926c97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,9 @@ endif() if(POLICY CMP0093) cmake_policy(SET CMP0093 NEW) endif() +if(POLICY CMP0093) + cmake_policy(SET CMP0093 NEW) +endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") if(CMAKE_SYSTEM_NAME MATCHES "Linux") diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 12f831fbd..f06cc91c9 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -23,6 +23,10 @@ if(Boost_VERSION VERSION_GREATER 1.73) add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) endif() +if(Boost_VERSION VERSION_GREATER_EQUAL 1.74) + add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) +endif() + set(librgw_common_srcs services/svc_finisher.cc services/svc_notify.cc -- 2.30.2