From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 9 Feb 2023 23:43:10 +0000 (-0500)
Subject: cmake: drop BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
X-Git-Tag: v19.3.0~349^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71bb05d8979d3ac2c5f52001cb449f8814b2ff5a;p=ceph.git

cmake: drop BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT

this define was added for backward compatibility before boost 1.74

https://www.boost.org/doc/libs/1_74_0/doc/html/boost_asio/std_executors.html

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5b1300bb84a..2f34a6ceb28 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -78,10 +78,8 @@ add_definitions(
   -D_THREAD_SAFE
   -D__STDC_FORMAT_MACROS
   -D_FILE_OFFSET_BITS=64
-  -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION)
-if(Boost_VERSION VERSION_GREATER_EQUAL 1.74)
-  add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
-endif()
+  -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION
+  -DBOOST_ASIO_NO_TS_EXECUTORS)
 
 if(LINUX)
   add_definitions("-D_GNU_SOURCE")