]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cmake: build bluestore-tp before crimson-alienstore
authorKefu Chai <kchai@redhat.com>
Thu, 29 Oct 2020 09:18:06 +0000 (17:18 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 29 Oct 2020 09:21:06 +0000 (17:21 +0800)
to address the FTBFS of

src/os/bluestore/BlueStore.cc:52:10: fatal error: tracing/bluestore.h: No such file or directory
   52 | #include "tracing/bluestore.h"
      |          ^~~~~~~~~~~~~~~~~~~~~
compilation terminated.

tracing/bluestore.h is created by the "bluestore-tp" target, there
is a good chance that we build crimson when WITH_LTTNG is enabled,
let's ensure that tracing/bluestore.h is ready before compiling
alienstore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/os/alienstore/CMakeLists.txt

index 2097ca90538c12e9c6bb592d122779709a9cce39..f9803c51864e26a01c984a63592af947d4d70982 100644 (file)
@@ -44,7 +44,9 @@ list(APPEND crimson_alien_srcs
 add_library(crimson-alienstore STATIC ${crimson_alien_srcs}
   $<TARGET_OBJECTS:compressor_objs>
   $<TARGET_OBJECTS:common_prioritycache_obj>)
-
+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_PROPERTY:Seastar::seastar,INTERFACE_INCLUDE_DIRECTORIES>)