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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00d497042c52ef827ecc9ddb0d1d4246a2232e06..9a0a88e181f838251dc8fcb184463f224c76b432 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,9 @@ endif()
 if(POLICY CMP0075)
   cmake_policy(SET CMP0075 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 9bfde0e457c206121a7f571eca2f5e9418fbb35e..d9bebc6d4470af002cccb3aedd2caced10a0a44c 100644 (file)
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -19,6 +19,10 @@ function(gperf_generate input output)
     )
 endfunction()
 
+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