]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/os/alienstore/CMakeLists: move alien::cflags
authorMatan Breizman <mbreizma@redhat.com>
Thu, 6 Feb 2025 11:06:33 +0000 (11:06 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Tue, 11 Mar 2025 12:40:42 +0000 (12:40 +0000)
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 <mbreizma@redhat.com>
src/crimson/os/alienstore/CMakeLists.txt

index 15eae38d52bee199cfefa68d6bee0ef98be84b5e..7e2f6b2a0d740d6fe880efb133f267a7392d0749 100644 (file)
@@ -1,10 +1,5 @@
 include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/rocksdb/include")
 
-add_library(alien::cflags INTERFACE IMPORTED)
-set_target_properties(alien::cflags PROPERTIES
-  INTERFACE_COMPILE_DEFINITIONS ""
-  INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Seastar::seastar,INTERFACE_INCLUDE_DIRECTORIES>)
-
 set(crimson_alien_common_srcs
   ${PROJECT_SOURCE_DIR}/src/common/admin_socket.cc
   ${PROJECT_SOURCE_DIR}/src/common/url_escape.cc
@@ -38,6 +33,10 @@ endif()
 add_library(crimson-alien-common STATIC
   ${crimson_alien_common_srcs})
 
+add_library(alien::cflags INTERFACE IMPORTED)
+set_target_properties(alien::cflags PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Seastar::seastar,INTERFACE_INCLUDE_DIRECTORIES>)
+
 set(alien_store_srcs
   alien_store.cc
   thread_pool.cc
@@ -63,11 +62,13 @@ set(alien_store_srcs
   ${PROJECT_SOURCE_DIR}/src/os/bluestore/Writer.cc
   ${PROJECT_SOURCE_DIR}/src/os/bluestore/BlueStore_debug.cc
   ${PROJECT_SOURCE_DIR}/src/os/memstore/MemStore.cc)
+
 add_library(crimson-alienstore STATIC
   ${alien_store_srcs})
 if(WITH_LTTNG)
   add_dependencies(crimson-alienstore bluestore-tp)
 endif()
+
 target_link_libraries(crimson-alienstore
   PRIVATE
     alien::cflags