From 9309c24504b654bd7304af6510571b16738bc11e Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 20 Dec 2018 12:51:37 +0800 Subject: [PATCH] cmake: let rbd_api depend on librbd-tp whoever includes tracing/librbd.h should depends on librbd-tp. this fix the FTBFS of: ceph/src/librbd/librbd.cc:50:10: fatal error: tracing/librbd.h: No such file or directory #include "tracing/librbd.h" ^~~~~~~~~~~~~~~~~~ compilation terminated. src/librbd/CMakeFiles/rbd_api.dir/build.make:62: recipe for target 'src/librbd/CMakeFiles/rbd_api.dir/librbd.cc.o' failed Signed-off-by: Kefu Chai --- src/librbd/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt index 1969abeb034c..93621c4ff4ea 100644 --- a/src/librbd/CMakeLists.txt +++ b/src/librbd/CMakeLists.txt @@ -139,6 +139,9 @@ add_library(rbd_internal STATIC ${librbd_internal_srcs} $) if(WITH_LTTNG) + # librbd.cc includes tracing/librbd.h + add_dependencies(rbd_api librbd-tp) + # io/AioCompletion.cc includes tracing/librbd.h add_dependencies(rbd_internal librbd-tp) endif() if(WITH_LTTNG AND WITH_EVENTTRACE) @@ -149,6 +152,9 @@ target_link_libraries(rbd_internal PRIVATE add_library(librbd ${CEPH_SHARED} librbd.cc) +if(WITH_LTTNG) + add_dependencies(librbd librbd-tp) +endif() target_link_libraries(librbd PRIVATE rbd_internal -- 2.47.3