From 4fe566540313d2611465ef08823ebf31200395a4 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 14 Dec 2020 20:46:50 +0800 Subject: [PATCH] cmake: add "alien::cflags" library which exposes the definitions needed for building alienized bluestore and the shared facilities compiled with -DWITH_ALIEN and -DWITH_SEASTAR Signed-off-by: Kefu Chai --- src/crimson/os/alienstore/CMakeLists.txt | 29 +++++++++++++++--------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/crimson/os/alienstore/CMakeLists.txt b/src/crimson/os/alienstore/CMakeLists.txt index 75b2f9d35ff2..27db331792dc 100644 --- a/src/crimson/os/alienstore/CMakeLists.txt +++ b/src/crimson/os/alienstore/CMakeLists.txt @@ -1,5 +1,10 @@ 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_INCLUDE_DIRECTORIES $) + add_library(crimson-alien-common STATIC ${PROJECT_SOURCE_DIR}/src/common/admin_socket.cc ${PROJECT_SOURCE_DIR}/src/common/blkdev.cc @@ -26,6 +31,9 @@ add_library(crimson-alien-common STATIC ${PROJECT_SOURCE_DIR}/src/global/global_context.cc $ $) +target_link_libraries(crimson-alien-common + crimson-common + alien::cflags) add_library(crimson-alienstore STATIC alien_store.cc @@ -47,15 +55,14 @@ add_library(crimson-alienstore STATIC if(WITH_LTTNG) add_dependencies(crimson-alienstore bluestore-tp) endif() -target_compile_definitions(crimson-alienstore PRIVATE -DWITH_SEASTAR -DWITH_ALIEN) -target_include_directories(crimson-alienstore PRIVATE - $) target_link_libraries(crimson-alienstore - fmt::fmt - kv - heap_profiler - crimson-alien-common - ${BLKID_LIBRARIES} - ${UDEV_LIBRARIES} - crimson - blk) + PRIVATE + alien::cflags + fmt::fmt + kv + heap_profiler + crimson-alien-common + ${BLKID_LIBRARIES} + ${UDEV_LIBRARIES} + crimson + blk) -- 2.47.3