From: Kefu Chai <kchai@redhat.com>
Date: Sun, 13 Dec 2020 15:33:57 +0000 (+0000)
Subject: cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for
X-Git-Tag: archive/raspbian/14.2.15-4+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af8cadcc3d029a4be05b63e3973f7724d1d11f15;p=ceph.git

cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for

Signed-off-by: Kefu Chai <kchai@redhat.com>
Origin: upstream, https://github.com/ceph/ceph/commit/3d708219092d0e89a1434c30ffc8a4999f062cc0.patch
Bug-Debian: https://bugs.debian.org/977243
Last-Update: 2020-12-13

Boost.Asio users

see also
https://www.boost.org/doc/libs/1_74_0/doc/html/boost_asio/std_executors.html#boost_asio.std_executors.polymorphic_i_o_executor

we could use `asio::any_io_executor` later on though for better
performance.

also, define CMP0093, so FindBoost reports Boost_VERSION in x.y.z
format. it is simpler to use `VERSION_GREATER_EQUAL` to compare its
version with 1.74 instead of its C macro version ("107000").

Gbp-Pq: Name cmake_define_BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT_for_Boost.Asio_users.patch
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32f0928ae..00d497042 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,9 @@ endif()
 if(POLICY CMP0051)
   cmake_policy(SET CMP0051 NEW)
 endif()
+if(POLICY CMP0074)
+  cmake_policy(SET CMP0074 NEW)
+endif()
 if(POLICY CMP0075)
   cmake_policy(SET CMP0075 NEW)
 endif()
diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt
index 30626d02b..b8c4b0457 100644
--- a/src/librbd/CMakeLists.txt
+++ b/src/librbd/CMakeLists.txt
@@ -1,3 +1,7 @@
+if(Boost_VERSION VERSION_GREATER_EQUAL 1.74)
+  add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
+endif()
+
 add_library(rbd_types STATIC
   journal/Types.cc
   mirroring_watcher/Types.cc