]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/os/alienstore/CmakeLists: Drop WITH_SEASTAR/ALIEN
authorMatan Breizman <mbreizma@redhat.com>
Wed, 5 Feb 2025 10:41:16 +0000 (10:41 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Tue, 11 Mar 2025 12:40:42 +0000 (12:40 +0000)
Removing WITH_SEASTAR/WITH_ALIEN will allow us to remove
WITH_ALIEN all together as now "alien" targets
are not defined WITH_SEASTAR.
Mere WITH_SEASTAR is enough to differentiate between "alien"
targets to ones used by Crimson.

Note: The cmake subdirectory of "crimson" will pull WITH_SEASTAR
to crimson-alienstore. That is why "crimson" is replaced by "seastar".
Ideally, we would not need to use "seastar" as well but the pure
alien sources (e.g alien_*.cc) must use seastar's concepts.

This "workaround" results in an crimson-alienstore to not be defined
WITH_SEASTAR even though it uses seastar. While this is not trivial,
it will help with removing WITH_ALIEN which makes Crimson's cmake
harder to understand. Moreover, WITH_SEASTAR trully represents a
Crimson target - and as crimson-alienstore is not trully Crimson,
his "workaround" seems to fit best.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
src/crimson/os/alienstore/CMakeLists.txt

index 6cf9e840ad0241ec84403c792bc248e803318bfe..15eae38d52bee199cfefa68d6bee0ef98be84b5e 100644 (file)
@@ -2,7 +2,7 @@ include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/rocksdb/include")
 
 add_library(alien::cflags INTERFACE IMPORTED)
 set_target_properties(alien::cflags PROPERTIES
-  INTERFACE_COMPILE_DEFINITIONS "WITH_SEASTAR;WITH_ALIEN"
+  INTERFACE_COMPILE_DEFINITIONS ""
   INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Seastar::seastar,INTERFACE_INCLUDE_DIRECTORIES>)
 
 set(crimson_alien_common_srcs
@@ -77,5 +77,5 @@ target_link_libraries(crimson-alienstore
     crimson-alien-common
     ${BLKID_LIBRARIES}
     ${UDEV_LIBRARIES}
-    crimson
+    seastar
     blk)