diff options
| author | Samuel Just <sjust@redhat.com> | 2019-06-21 02:46:21 +0200 |
|---|---|---|
| committer | Samuel Just <sjust@redhat.com> | 2019-09-28 00:55:18 +0200 |
| commit | 670e00a06a42a154da442435f41bbabfbe23f2bb (patch) | |
| tree | 93db14e07066d8209613783b4bbe3726da003a73 /src/librbd | |
| parent | fio_ceph_objectstore: clean up formatted output, add option to write to file (diff) | |
| download | ceph-670e00a06a42a154da442435f41bbabfbe23f2bb.tar.xz ceph-670e00a06a42a154da442435f41bbabfbe23f2bb.zip | |
*/CMakeLists: add EVENTTRACE as cmakedefine, require LTTNG
Because EVENTTRACE now implies LTTNG, also cleanup EVENTTRACE
conditions to assume LTTNG.
Also add missing eventtrace dependencies to rbd and
test/objectstore.
Signed-off-by: Samuel Just <sjust@redhat.com>
Diffstat (limited to 'src/librbd')
| -rw-r--r-- | src/librbd/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt index 057d4a95c07..6fa139f194c 100644 --- a/src/librbd/CMakeLists.txt +++ b/src/librbd/CMakeLists.txt @@ -142,6 +142,11 @@ set(librbd_internal_srcs watcher/RewatchRequest.cc ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc) +if(WITH_EVENTTRACE) + list(APPEND librbd_internal_srcs ../common/EventTrace.cc) +endif() + + add_library(rbd_api STATIC librbd.cc) add_library(rbd_internal STATIC ${librbd_internal_srcs} @@ -152,7 +157,7 @@ if(WITH_LTTNG) # io/AioCompletion.cc includes tracing/librbd.h add_dependencies(rbd_internal librbd-tp) endif() -if(WITH_LTTNG AND WITH_EVENTTRACE) +if(WITH_EVENTTRACE) add_dependencies(rbd_internal eventtrace_tp) endif() target_link_libraries(rbd_internal PRIVATE |