From: Kefu Chai <kchai@redhat.com>
Date: Thu, 19 May 2016 04:23:10 +0000 (+0800)
Subject: cmake: reuse secret.c's object library
X-Git-Tag: v11.0.0~502^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a590094f0532095890355dd42aac85078a39295a;p=ceph.git

cmake: reuse secret.c's object library

so we don't need to recompile it when using it.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7833502fa5e..cfccb67b079 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -552,7 +552,7 @@ add_subdirectory(ceph-detect-init)
 set(dencoder_srcs
   test/encoding/ceph_dencoder.cc
   $<TARGET_OBJECTS:krbd_objs>
-  common/secret.c
+  $<TARGET_OBJECTS:parse_secret_objs>
   common/TextTable.cc
   )
 if(${WITH_RADOSGW})
diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
index 6af76627552..d1a903b6176 100644
--- a/src/test/bench/CMakeLists.txt
+++ b/src/test/bench/CMakeLists.txt
@@ -19,10 +19,10 @@ if (${WITH_RBD})
     detailed_stat_collector.cc
     bencher.cc
     ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
-    ${CMAKE_SOURCE_DIR}/src/common/secret.c
   )
   add_executable(ceph_smalliobenchrbd
     ${smalliobenchrbd_srcs}
+    $<TARGET_OBJECTS:parse_secret_objs>
     )
   target_link_libraries(ceph_smalliobenchrbd
     librbd
diff --git a/src/test/cls_rbd/CMakeLists.txt b/src/test/cls_rbd/CMakeLists.txt
index ac6029b8ea4..65ada22255c 100644
--- a/src/test/cls_rbd/CMakeLists.txt
+++ b/src/test/cls_rbd/CMakeLists.txt
@@ -2,7 +2,7 @@
 add_executable(ceph_test_cls_rbd
   test_cls_rbd.cc
   ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
-  ${CMAKE_SOURCE_DIR}/src/common/secret.c
+  $<TARGET_OBJECTS:parse_secret_objs>
   )
 set_target_properties(ceph_test_cls_rbd PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
index e51a96c1a52..0798a0be71a 100644
--- a/src/test/librbd/CMakeLists.txt
+++ b/src/test/librbd/CMakeLists.txt
@@ -122,7 +122,7 @@ add_executable(ceph_test_librbd_fsx
   fsx.cc
   $<TARGET_OBJECTS:krbd_objs>
   ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
-  ${CMAKE_SOURCE_DIR}/src/common/secret.c
+  $<TARGET_OBJECTS:parse_secret_objs>
   )
 target_link_libraries(ceph_test_librbd_fsx
   librbd