From: Kefu Chai <kchai@redhat.com>
Date: Tue, 30 Aug 2016 05:33:59 +0000 (+0800)
Subject: cmake: let librados_api_obj depend on librados-tp
X-Git-Tag: v11.0.1~358^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0a717593c0c375dcdd9c74e93de5e82b974f1419;p=ceph.git

cmake: let librados_api_obj depend on librados-tp

so we don't need to messing up with the target names.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/librados/CMakeLists.txt b/src/librados/CMakeLists.txt
index 24d1398297f6..6d950a6d2422 100644
--- a/src/librados/CMakeLists.txt
+++ b/src/librados/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(librados ${CEPH_SHARED}
   $<TARGET_OBJECTS:common_buffer_obj>)
 add_dependencies(librados osdc)
 if(WITH_LTTNG)
-  add_dependencies(librados_api_obj rados-tp)
+  add_dependencies(librados_api_obj librados-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
diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt
index 4c49012ac8f5..988529f45903 100644
--- a/src/librbd/CMakeLists.txt
+++ b/src/librbd/CMakeLists.txt
@@ -75,7 +75,7 @@ add_library(rbd_internal STATIC
   ${librbd_internal_srcs}
   $<TARGET_OBJECTS:rados_snap_set_diff_obj>)
 if(WITH_LTTNG)
-  add_dependencies(rbd_api rbd-tp)
+  add_dependencies(rbd_api librbd-tp)
 endif()
 
 add_library(librbd ${CEPH_SHARED}
diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index 9cc14367c1b4..eddb575ffa59 100644
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -73,7 +73,7 @@ if(WITH_SPDK)
 endif(WITH_SPDK)
 
 if(WITH_LTTNG)
-  add_dependencies(os os-tp)
+  add_dependencies(os objectstore-tp)
 endif()
 
 target_link_libraries(os kv)
diff --git a/src/osd/CMakeLists.txt b/src/osd/CMakeLists.txt
index c85840b3e787..e4f720e6fc68 100644
--- a/src/osd/CMakeLists.txt
+++ b/src/osd/CMakeLists.txt
@@ -35,5 +35,5 @@ add_library(osd STATIC ${osd_srcs}
   $<TARGET_OBJECTS:common_util_obj>)
 target_link_libraries(osd ${LEVELDB_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
 if(WITH_LTTNG)
-  add_dependencies(osd osd-tp)
+  add_dependencies(osd oprequest-tp osd-tp pg-tp)
 endif()
diff --git a/src/tracing/CMakeLists.txt b/src/tracing/CMakeLists.txt
index 9b21a092a05b..8cde4fbc0344 100644
--- a/src/tracing/CMakeLists.txt
+++ b/src/tracing/CMakeLists.txt
@@ -18,6 +18,9 @@ foreach(tp ${tps})
     COMMENT "generating ${header} ${src}")
   set_source_files_properties(${header} ${src}
     PROPERTIES GENERATED TRUE)
+  add_custom_target(
+    ${name}-tp
+    DEPENDS ${header})
 endforeach()
 
 function(add_tracing_library name tracings version)
@@ -36,10 +39,6 @@ function(add_tracing_library name tracings version)
     OUTPUT_NAME ${name}
     VERSION ${version}
     SOVERSION ${soversion})
-  string(REGEX REPLACE "_tp$" "" traced ${name})
-  add_custom_target(
-    ${traced}-tp
-    DEPENDS ${hdrs})
 endfunction()
 
 set(osd_traces oprequest.tp osd.tp pg.tp)