From: Kefu Chai Date: Thu, 29 Oct 2020 09:18:06 +0000 (+0800) Subject: cmake: build bluestore-tp before crimson-alienstore X-Git-Tag: v16.1.0~727^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76fe6fc32c3a2ce84d0f54d72642951737bdee0b;p=ceph.git cmake: build bluestore-tp before crimson-alienstore 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 --- diff --git a/src/crimson/os/alienstore/CMakeLists.txt b/src/crimson/os/alienstore/CMakeLists.txt index 2097ca90538c..f9803c51864e 100644 --- a/src/crimson/os/alienstore/CMakeLists.txt +++ b/src/crimson/os/alienstore/CMakeLists.txt @@ -44,7 +44,9 @@ list(APPEND crimson_alien_srcs add_library(crimson-alienstore STATIC ${crimson_alien_srcs} $ $) - +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 $)