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>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af82f20778d5e69309eb2b2c00b9b349873fb7b0..bc255b4df40ed81393d7855c411799b246e67762 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8a92da63dd9fcc5c543c0c2fc6573fd750f38e1a..e4c16866e3f4b5197c4b011325227cafa1068383 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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()

diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 2b5fcd1270655a0a77040db558a62c4ab40cef53..7285210c7b1a5857baa0510676f8e64463105653 100644 (file)
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -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