Skip to content

Commit 9b02ebf

Browse files
authored
Merge pull request ceph#61659 from Matan-B/wip-matanb-cmake-crimson-boost-asio
crimson/CMakeLists: cleanup BOOST_ASIO_DISABLE_CONCEPTS Reviewed-by: Yingxin Cheng <[email protected]>
2 parents ba75391 + 8679652 commit 9b02ebf

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/crimson/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
add_library(crimson::cflags INTERFACE IMPORTED)
22
set(crimson_cflag_definitions "WITH_SEASTAR=1")
3-
# disable concepts to address https://github.com/boostorg/asio/issues/312
4-
if((CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10) OR
5-
(CMAKE_CXX_COMPILER_ID STREQUAL Clang))
6-
list(APPEND crimson_cflag_definitions
7-
"BOOST_ASIO_DISABLE_CONCEPTS")
8-
endif()
3+
94
set_target_properties(crimson::cflags PROPERTIES
105
INTERFACE_COMPILE_DEFINITIONS "${crimson_cflag_definitions}"
116
INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:-Wno-non-virtual-dtor>

0 commit comments

Comments
 (0)