From: Kefu Chai <kchai@redhat.com>
Date: Thu, 23 Jun 2016 02:40:28 +0000 (+0800)
Subject: cmake: move rados_snap_set_diff_obj into librbd_internal
X-Git-Tag: v11.0.0~67^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ccdb517d671e0c8de08c837ee564bc494677bd8;p=ceph.git

cmake: move rados_snap_set_diff_obj into librbd_internal

ceph_test_librbd use it and links directly against librbd_internal
instead of against librbd

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1047d181a8d..0f53a9f28eec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1240,8 +1240,7 @@ if(${WITH_RBD})
     tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc
     tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc)
   add_library(rbd_mirror_internal STATIC
-    ${rbd_mirror_internal}
-    $<TARGET_OBJECTS:rados_snap_set_diff_obj>)
+    ${rbd_mirror_internal})
 
   if(WITH_FUSE)
     add_executable(rbd-fuse
diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt
index 5174063f1df5..a08f17d61377 100644
--- a/src/librbd/CMakeLists.txt
+++ b/src/librbd/CMakeLists.txt
@@ -64,7 +64,9 @@ set(librbd_internal_srcs
   operation/TrimRequest.cc)
 
 add_library(rbd_api STATIC librbd.cc)
-add_library(rbd_internal STATIC ${librbd_internal_srcs})
+add_library(rbd_internal STATIC
+  ${librbd_internal_srcs}
+  $<TARGET_OBJECTS:rados_snap_set_diff_obj>)
 if(WITH_LTTNG)
   add_dependencies(rbd_internal rbd-tp)
 endif()
@@ -73,8 +75,7 @@ add_library(librbd ${CEPH_SHARED}
   $<TARGET_OBJECTS:osdc_rbd_objs>
   $<TARGET_OBJECTS:common_util_obj>
   $<TARGET_OBJECTS:krbd_objs>
-  $<TARGET_OBJECTS:parse_secret_objs>
-  $<TARGET_OBJECTS:rados_snap_set_diff_obj>
+  $<TARGET_OBJECTS:parse_secret_objs>  
   ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc
   librbd.cc)
 target_link_libraries(librbd LINK_PRIVATE