From b1fd569ad810e14b96461667bcec4760daa99140 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 21 Mar 2021 23:06:00 +0800 Subject: [PATCH] cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT globaly turns out we also need it for compiling librados tests with libboost 1.75, so just define it globally Signed-off-by: Kefu Chai (cherry picked from commit 7ce3ee6f346889d4d87d6424c6a1ad18badd139b) --- src/CMakeLists.txt | 4 ++++ src/librbd/CMakeLists.txt | 4 ---- src/rgw/CMakeLists.txt | 4 ---- src/test/rgw/CMakeLists.txt | 4 ---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37db48f8653c9..2a80566150ce4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,6 +30,10 @@ add_definitions( -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() + if(LINUX) add_definitions("-D_GNU_SOURCE") endif() diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt index 4424674e3caff..a41d85d04daa7 100644 --- a/src/librbd/CMakeLists.txt +++ b/src/librbd/CMakeLists.txt @@ -1,7 +1,3 @@ -if(Boost_VERSION VERSION_GREATER_EQUAL 1.74) - add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) -endif() - set(librbd_types_srcs journal/Types.cc mirroring_watcher/Types.cc diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index d3d91d4957947..9e977ff03512e 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -1,7 +1,3 @@ -if(Boost_VERSION VERSION_GREATER_EQUAL 1.74) - add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) -endif() - add_custom_target(civetweb_h COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/src/include/civetweb" diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt index 24dba562d14e7..569cbb93a0e69 100644 --- a/src/test/rgw/CMakeLists.txt +++ b/src/test/rgw/CMakeLists.txt @@ -1,7 +1,3 @@ -if(Boost_VERSION VERSION_GREATER_EQUAL 1.74) - add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) -endif() - if(WITH_RADOSGW_AMQP_ENDPOINT) # amqp mock library set(amqp_mock_src -- 2.39.5