turns out we also need it for compiling librados tests with libboost
1.75, so just define it globally
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
7ce3ee6f346889d4d87d6424c6a1ad18badd139b)
Conflicts:
src/CMakeLists.txt
src/librbd/CMakeLists.txt: trivial resolution
set(datadir ${CEPH_INSTALL_DATADIR})
set(prefix ${CMAKE_INSTALL_PREFIX})
-add_definitions("-DHAVE_CONFIG_H -D__CEPH__ -D_REENTRANT -D_THREAD_SAFE -D__STDC_FORMAT_MACROS")
-add_definitions("-D_FILE_OFFSET_BITS=64")
+add_definitions(
+ -DHAVE_CONFIG_H
+ -D__CEPH__
+ -D_REENTRANT
+ -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()
+
if(LINUX)
add_definitions("-D_GNU_SOURCE")
endif()
-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
-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"
-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