From: Thomas Goirand <zigo@debian.org>
Date: Wed, 21 Apr 2021 08:02:07 +0000 (+0100)
Subject: Another cmakelists fix
X-Git-Tag: archive/raspbian/14.2.20-2+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=820fb2f39c1c99cd81509531aab206f2bdb006a7;p=ceph.git

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 3059f5ec1..f54128c71 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