From 491cf4eaf097bd367771b22c37c472503ba5a662 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 25 Jul 2017 14:30:46 -0700 Subject: [PATCH] CMakeLists: trim rbd/rgw accidental dependencies Signed-off-by: Patrick Donnelly --- src/libcephd/CMakeLists.txt | 10 ++++++++-- src/osdc/CMakeLists.txt | 8 +++----- src/tracing/CMakeLists.txt | 7 +++++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/libcephd/CMakeLists.txt b/src/libcephd/CMakeLists.txt index 5ace601a15b..d34a9003d9d 100644 --- a/src/libcephd/CMakeLists.txt +++ b/src/libcephd/CMakeLists.txt @@ -15,8 +15,6 @@ set(merge_libs cephd_cls cephd_cls_kvs cephd_rados - cephd_rbd - cephd_rgw common common_utf8 erasure_code @@ -33,6 +31,14 @@ if(NOT WITH_SYSTEM_ROCKSDB) list(APPEND merge_libs ${ROCKSDB_LIBRARIES}) endif(NOT WITH_SYSTEM_ROCKSDB) +if(WITH_RADOSGW) + list(APPEND merge_libs cephd_rgw) +endif(WITH_RADOSGW) + +if(WITH_RBD) + list(APPEND merge_libs cephd_rbd) +endif(WITH_RBD) + if(HAVE_ARMV8_CRC) list(APPEND merge_libs common_crc_aarch64) endif(HAVE_ARMV8_CRC) diff --git a/src/osdc/CMakeLists.txt b/src/osdc/CMakeLists.txt index 8593f2f4ed3..ef34e62975d 100644 --- a/src/osdc/CMakeLists.txt +++ b/src/osdc/CMakeLists.txt @@ -1,11 +1,9 @@ set(osdc_files - Objecter.cc - Filer.cc) -set(osdc_rbd_files + Filer.cc ObjectCacher.cc + Objecter.cc Striper.cc) -add_library(osdc_rbd_objs OBJECT ${osdc_rbd_files}) -add_library(osdc STATIC ${osdc_files} $) +add_library(osdc STATIC ${osdc_files}) if(WITH_LTTNG AND WITH_EVENTTRACE) add_dependencies(osdc eventtrace_tp) endif() diff --git a/src/tracing/CMakeLists.txt b/src/tracing/CMakeLists.txt index 72257138baa..ec2a8b4f0ac 100644 --- a/src/tracing/CMakeLists.txt +++ b/src/tracing/CMakeLists.txt @@ -44,10 +44,13 @@ endfunction() set(osd_traces oprequest.tp osd.tp pg.tp) add_tracing_library(osd_tp "${osd_traces}" 1.0.0) add_tracing_library(rados_tp librados.tp 2.0.0) -add_tracing_library(rbd_tp librbd.tp 1.0.0) add_tracing_library(os_tp objectstore.tp 1.0.0) -install(TARGETS rados_tp osd_tp rbd_tp os_tp DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(TARGETS rados_tp osd_tp os_tp DESTINATION ${CMAKE_INSTALL_LIBDIR}) +if(WITH_RBD) + add_tracing_library(rbd_tp librbd.tp 1.0.0) + install(TARGETS rbd_tp DESTINATION ${CMAKE_INSTALL_LIBDIR}) +endif(WITH_RBD) if(WITH_OSD_INSTRUMENT_FUNCTIONS) add_tracing_library(cyg_profile_tp cyg_profile.tp 1.0.0) install(TARGETS cyg_profile_tp DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- 2.47.3