]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cmake: fix the tracing header dependencies
authorKefu Chai <kchai@redhat.com>
Mon, 29 Aug 2016 07:05:55 +0000 (15:05 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 29 Aug 2016 07:06:44 +0000 (15:06 +0800)
in aa679df, we move librados.cc into a separated obj target. this broken
the dependency from librados.o to its tracing header. we need to update
it accordingly.

this change fixes the following compilation error:
```
/var/ceph/ceph/src/librados/librados.cc:47:30: fatal error:
tracing/librados.h: No such file or directory
 #include "tracing/librados.h"
                              ^
compilation terminated.
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/librados/CMakeLists.txt
src/librbd/CMakeLists.txt

index d7d01a699be9c1e593012952735167b561079313..24d1398297f6e2e39a7c7a5633ff356cadd1a83c 100644 (file)
@@ -10,7 +10,7 @@ add_library(librados ${CEPH_SHARED}
   $<TARGET_OBJECTS:common_buffer_obj>)
 add_dependencies(librados osdc)
 if(WITH_LTTNG)
-  add_dependencies(librados rados-tp)
+  add_dependencies(librados_api_obj rados-tp)
 endif()
 # LINK_PRIVATE instead of PRIVATE is used to backward compatibility with cmake 2.8.11
 target_link_libraries(librados LINK_PRIVATE osdc common cls_lock_client
index 1eaa652c974daf5c95d3d72b18fa7061a4982c8f..a7f12a8d35dca4d7b1e4ef40b3d37c7d7a1bb9d0 100644 (file)
@@ -73,7 +73,7 @@ add_library(rbd_internal STATIC
   ${librbd_internal_srcs}
   $<TARGET_OBJECTS:rados_snap_set_diff_obj>)
 if(WITH_LTTNG)
-  add_dependencies(rbd_internal rbd-tp)
+  add_dependencies(rbd_api rbd-tp)
 endif()
 
 add_library(librbd ${CEPH_SHARED}