mirror of
https://github.com/ceph/ceph
synced 2026-08-01 22:45:39 +00:00
cmake: replace WITH_SEASTAR with WITH_CRIMSON
Remove the deprecated WITH_SEASTAR CMake option and replace all
references with WITH_CRIMSON for consistency. Although WITH_SEASTAR
was functionally replaced in commit 23c33f69, it remained in the
source tree. This change completes the migration by removing the
old option entirely and standardizing on WITH_CRIMSON throughout
the codebase.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
This commit is contained in:
parent
5aeaa104d8
commit
a302ae7fe3
@ -736,7 +736,6 @@ if (WITH_SYSTEM_ROCKSDB)
|
||||
endif()
|
||||
|
||||
option(WITH_CRIMSON "Build seastar components")
|
||||
set(HAVE_SEASTAR ${WITH_CRIMSON})
|
||||
|
||||
# Boost
|
||||
option(WITH_SYSTEM_BOOST "require and build with system Boost" OFF)
|
||||
|
||||
@ -131,7 +131,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
|
||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
|
||||
message(FATAL_ERROR "C++20 support for win32 requires a minimum GCC version of 10.")
|
||||
endif()
|
||||
elseif(HAVE_SEASTAR)
|
||||
elseif(WITH_CRIMSON)
|
||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
|
||||
# see https://tracker.ceph.com/issues/64375 for details
|
||||
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)
|
||||
# cmake does not add '-pie' for executables even if
|
||||
# CMAKE_POSITION_INDEPENDENT_CODE is TRUE.
|
||||
if(EXE_LINKER_USE_PIE)
|
||||
if (NOT WITH_OSD_INSTRUMENT_FUNCTIONS AND NOT HAVE_SEASTAR)
|
||||
if (NOT WITH_OSD_INSTRUMENT_FUNCTIONS AND NOT WITH_CRIMSON)
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS " -pie")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@ -378,9 +378,6 @@
|
||||
/* Defined if UADK compress/decompress is supported */
|
||||
#cmakedefine HAVE_UADK
|
||||
|
||||
/* Define if seastar is available. */
|
||||
#cmakedefine HAVE_SEASTAR
|
||||
|
||||
/* Define if unit tests are built. */
|
||||
#cmakedefine UNIT_TESTS_BUILT
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user