From: Kefu Chai Date: Fri, 1 Jun 2018 12:38:25 +0000 (+0800) Subject: cmake: rgw_common should depend on tracing headers X-Git-Tag: v14.0.1~1212^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1640bc2a1cbb1b269bf437c2858ae0a5e6cf5d2;p=ceph.git cmake: rgw_common should depend on tracing headers see also: 4c0d3531 Signed-off-by: Kefu Chai --- diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index f0b1c28b9fb3..56a31c6a45c9 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -112,6 +112,12 @@ set(librgw_common_srcs ) add_library(rgw_common OBJECT ${librgw_common_srcs}) +if(WITH_LTTNG) + # rgw/rgw_op.cc includes "tracing/rgw_op.h" + # rgw/rgw_rados.cc includes "tracing/rgw_rados.h" + add_dependencies(rgw_common rgw_op-tp rgw_rados-tp) +endif() + set(rgw_a_srcs rgw_auth_keystone.cc rgw_client_io.cc @@ -155,10 +161,6 @@ add_dependencies(rgw_a civetweb_h) target_include_directories(rgw_a SYSTEM PUBLIC "../rapidjson/include") -if(WITH_LTTNG) - add_dependencies(rgw_a rgw_op-tp rgw_rados-tp) -endif() - target_link_libraries(rgw_a librados cls_otp_client cls_lock_client cls_rgw_client cls_refcount_client cls_log_client cls_statelog_client cls_timeindex_client cls_version_client cls_user_client ceph-common common_utf8 global