From 9f8a311ceddd66fca45b143fcba53d58dddff899 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 9 Nov 2016 13:11:13 +0800 Subject: [PATCH] cmake: move ContextCompletion.cc into rbd_internal - ContextCompletion.cc is used by TrimRequest.cc which is included by rbd_internal, it's more natural to put ContextCompletion.cc into rbd_internal also. as rbd_internal is the only consumer of this translation unit. - librbd/internal.cc is not referencing any symbols from util.cc, so remove this include. and also, do not add $ to librbd. Signed-off-by: Kefu Chai --- src/librbd/CMakeLists.txt | 6 ++---- src/librbd/internal.cc | 1 - src/test/librbd/CMakeLists.txt | 2 -- src/test/rbd_mirror/CMakeLists.txt | 2 -- src/tools/rbd_mirror/CMakeLists.txt | 3 +-- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt index 54d1ed82e87b0..4ca11682389df 100644 --- a/src/librbd/CMakeLists.txt +++ b/src/librbd/CMakeLists.txt @@ -82,7 +82,8 @@ set(librbd_internal_srcs operation/SnapshotRollbackRequest.cc operation/SnapshotUnprotectRequest.cc operation/SnapshotLimitRequest.cc - operation/TrimRequest.cc) + operation/TrimRequest.cc + ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc) add_library(rbd_api STATIC librbd.cc) add_library(rbd_internal STATIC @@ -93,9 +94,6 @@ if(WITH_LTTNG) endif() add_library(librbd ${CEPH_SHARED} - $ - $ - ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc librbd.cc) if(LINUX) list(APPEND librbd diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 21188895c2770..38f7114783e46 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -43,7 +43,6 @@ #include "librbd/exclusive_lock/AutomaticPolicy.h" #include "librbd/exclusive_lock/StandardPolicy.h" #include "librbd/operation/TrimRequest.h" -#include "include/util.h" #include "journal/Journaler.h" diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt index 3a9f051452d7d..eab069ba73ff9 100644 --- a/src/test/librbd/CMakeLists.txt +++ b/src/test/librbd/CMakeLists.txt @@ -60,7 +60,6 @@ set(unittest_librbd_srcs ) add_executable(unittest_librbd ${unittest_librbd_srcs} - ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc $) target_compile_definitions(unittest_librbd PUBLIC "-DTEST_LIBRBD_INTERNALS") set_target_properties(unittest_librbd PROPERTIES COMPILE_FLAGS @@ -88,7 +87,6 @@ target_link_libraries(unittest_librbd add_executable(ceph_test_librbd test_main.cc - ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc $) target_link_libraries(ceph_test_librbd rbd_test diff --git a/src/test/rbd_mirror/CMakeLists.txt b/src/test/rbd_mirror/CMakeLists.txt index 2d5d92e51d0e0..917eedc01e648 100644 --- a/src/test/rbd_mirror/CMakeLists.txt +++ b/src/test/rbd_mirror/CMakeLists.txt @@ -25,7 +25,6 @@ add_executable(unittest_rbd_mirror image_sync/test_mock_SnapshotCreateRequest.cc image_sync/test_mock_SyncPointCreateRequest.cc image_sync/test_mock_SyncPointPruneRequest.cc - ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc ) add_ceph_unittest(unittest_rbd_mirror ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_rbd_mirror) set_target_properties(unittest_rbd_mirror PROPERTIES COMPILE_FLAGS @@ -55,7 +54,6 @@ target_link_libraries(unittest_rbd_mirror add_executable(ceph_test_rbd_mirror test_main.cc - ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc ) set_target_properties(ceph_test_rbd_mirror PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS}) diff --git a/src/tools/rbd_mirror/CMakeLists.txt b/src/tools/rbd_mirror/CMakeLists.txt index 459f457210c72..fc7b504c51e2d 100644 --- a/src/tools/rbd_mirror/CMakeLists.txt +++ b/src/tools/rbd_mirror/CMakeLists.txt @@ -26,8 +26,7 @@ add_library(rbd_mirror_internal STATIC ${rbd_mirror_internal}) add_executable(rbd-mirror - main.cc - ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc) + main.cc) target_link_libraries(rbd-mirror rbd_mirror_internal rbd_api -- 2.39.5