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 7833502fa5ead04f4eb27243a1610e0d89a263ee..cfccb67b079c68bb91db695f7780f6331d216777 100644 (file)
--- 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 6af766275527fffe13a40427908c7d72df200ef2..d1a903b61767fbfe2903c586584520dcb60de7d9 100644 (file)
--- 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 ac6029b8ea4f4c83ec739760ffe9b2f5533ea6ed..65ada22255c27a8edbcac5c7e6d0af82925656fd 100644 (file)
--- 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 e51a96c1a52587fedd92f7ab83d6eddac3e980fb..0798a0be71a7b54e77781c35a4e02b1c05cf861a 100644 (file)
--- 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