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 d03fe93f8e5e9f501e4841fa8c35bdd4f312716a..da9926c97eea2880dc161b5094c3ce6cf480463f 100644 (file)
--- 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 12f831fbd8867823d49356560b4084b3d4c489d4..f06cc91c96979c31f833e55a3bcecd8ae50bdf0b 100644 (file)
--- 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