Skip to content

Commit 5bb1d9e

Browse files
committed
crimson/os/alienstore/CmakeLists: Drop WITH_SEASTAR/ALIEN
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 <[email protected]>
1 parent facd084 commit 5bb1d9e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/crimson/os/alienstore/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/rocksdb/include")
22

33
add_library(alien::cflags INTERFACE IMPORTED)
44
set_target_properties(alien::cflags PROPERTIES
5-
INTERFACE_COMPILE_DEFINITIONS "WITH_SEASTAR;WITH_ALIEN"
5+
INTERFACE_COMPILE_DEFINITIONS ""
66
INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Seastar::seastar,INTERFACE_INCLUDE_DIRECTORIES>)
77

88
set(crimson_alien_common_srcs
@@ -77,5 +77,5 @@ target_link_libraries(crimson-alienstore
7777
crimson-alien-common
7878
${BLKID_LIBRARIES}
7979
${UDEV_LIBRARIES}
80-
crimson
80+
seastar
8181
blk)

0 commit comments

Comments
 (0)