Skip to content

Commit b097090

Browse files
committed
crimson/os/alienstore/CMakeLists: move alien::cflags
alien::cflags is now only relevant to crimson-alienstore. Remove empty INTERFACE_COMPILE_DEFINITIONS. Note: alien::cflags can be probably entirely removed and replaced by target_include_directories. However, this causes ``` 'seastar::continuation_base<>' has virtual functions but non-virtual destructor ``` for alien_*.cc users. Can be addressed seperatly. Signed-off-by: Matan Breizman <[email protected]>
1 parent 5bb1d9e commit b097090

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/crimson/os/alienstore/CMakeLists.txt

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

3-
add_library(alien::cflags INTERFACE IMPORTED)
4-
set_target_properties(alien::cflags PROPERTIES
5-
INTERFACE_COMPILE_DEFINITIONS ""
6-
INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Seastar::seastar,INTERFACE_INCLUDE_DIRECTORIES>)
7-
83
set(crimson_alien_common_srcs
94
${PROJECT_SOURCE_DIR}/src/common/admin_socket.cc
105
${PROJECT_SOURCE_DIR}/src/common/url_escape.cc
@@ -38,6 +33,10 @@ endif()
3833
add_library(crimson-alien-common STATIC
3934
${crimson_alien_common_srcs})
4035

36+
add_library(alien::cflags INTERFACE IMPORTED)
37+
set_target_properties(alien::cflags PROPERTIES
38+
INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Seastar::seastar,INTERFACE_INCLUDE_DIRECTORIES>)
39+
4140
set(alien_store_srcs
4241
alien_store.cc
4342
thread_pool.cc
@@ -63,11 +62,13 @@ set(alien_store_srcs
6362
${PROJECT_SOURCE_DIR}/src/os/bluestore/Writer.cc
6463
${PROJECT_SOURCE_DIR}/src/os/bluestore/BlueStore_debug.cc
6564
${PROJECT_SOURCE_DIR}/src/os/memstore/MemStore.cc)
65+
6666
add_library(crimson-alienstore STATIC
6767
${alien_store_srcs})
6868
if(WITH_LTTNG)
6969
add_dependencies(crimson-alienstore bluestore-tp)
7070
endif()
71+
7172
target_link_libraries(crimson-alienstore
7273
PRIVATE
7374
alien::cflags

0 commit comments

Comments
 (0)