Skip to content

Commit c8e6b25

Browse files
authored
Merge pull request ceph#64246 from tchaikov/wip-cmake-drop-with_seastar
cmake: replace WITH_SEASTAR with WITH_CRIMSON Reviewed-by: Matan Breizman <[email protected]>
2 parents afeb271 + a302ae7 commit c8e6b25

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,6 @@ if (WITH_SYSTEM_ROCKSDB)
736736
endif()
737737

738738
option(WITH_CRIMSON "Build seastar components")
739-
set(HAVE_SEASTAR ${WITH_CRIMSON})
740739

741740
# Boost
742741
option(WITH_SYSTEM_BOOST "require and build with system Boost" OFF)

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
131131
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
132132
message(FATAL_ERROR "C++20 support for win32 requires a minimum GCC version of 10.")
133133
endif()
134-
elseif(HAVE_SEASTAR)
134+
elseif(WITH_CRIMSON)
135135
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
136136
# see https://tracker.ceph.com/issues/64375 for details
137137
message(FATAL_ERROR "crimson/seastar require minimum GCC version of 13 for C++20 and coroutine support")
@@ -153,7 +153,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
153153
# cmake does not add '-pie' for executables even if
154154
# CMAKE_POSITION_INDEPENDENT_CODE is TRUE.
155155
if(EXE_LINKER_USE_PIE)
156-
if (NOT WITH_OSD_INSTRUMENT_FUNCTIONS AND NOT HAVE_SEASTAR)
156+
if (NOT WITH_OSD_INSTRUMENT_FUNCTIONS AND NOT WITH_CRIMSON)
157157
string(APPEND CMAKE_EXE_LINKER_FLAGS " -pie")
158158
endif()
159159
endif()

src/include/config-h.in.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,6 @@
378378
/* Defined if UADK compress/decompress is supported */
379379
#cmakedefine HAVE_UADK
380380

381-
/* Define if seastar is available. */
382-
#cmakedefine HAVE_SEASTAR
383-
384381
/* Define if unit tests are built. */
385382
#cmakedefine UNIT_TESTS_BUILT
386383

0 commit comments

Comments
 (0)