From: Kefu Chai <kchai@redhat.com>
Date: Wed, 24 Aug 2016 03:12:31 +0000 (+0800)
Subject: cmake: do not link secret.c if not necessary
X-Git-Tag: v11.0.1~382^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd0386ccb92ee90a19cacac2f54507b037a40055;p=ceph.git

cmake: do not link secret.c if not necessary

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

diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
index 43480ef20f7a..018a7c8d5534 100644
--- a/src/rbd_replay/CMakeLists.txt
+++ b/src/rbd_replay/CMakeLists.txt
@@ -25,12 +25,8 @@ add_library(rbd_replay_ios STATIC ${librbd_replay_ios_srcs})
 target_link_libraries(rbd_replay_ios librbd librados global)
 
 if(${WITH_BABELTRACE})
-  set(rbd_replay_prep_srcs
-      rbd-replay-prep.cc)
   add_executable(rbd-replay-prep
-    ${rbd_replay_prep_srcs}
-    $<TARGET_OBJECTS:parse_secret_objs>
-    )
+    rbd-replay-prep.cc)
   target_link_libraries(rbd-replay-prep
     rbd_replay
     rbd_replay_ios
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 22c9a2ca39cb..f0c50c378bda 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -776,9 +776,7 @@ target_link_libraries(unittest_libcephfs_config cephfs)
 
 # unittest_rbd_replay
 add_executable(unittest_rbd_replay
-  test_rbd_replay.cc
-  $<TARGET_OBJECTS:parse_secret_objs>
-)
+  test_rbd_replay.cc)
 add_ceph_unittest(unittest_rbd_replay ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_rbd_replay)
 target_link_libraries(unittest_rbd_replay
   librbd
diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
index 512376002f63..8b59bfb1aa02 100644
--- a/src/test/bench/CMakeLists.txt
+++ b/src/test/bench/CMakeLists.txt
@@ -21,9 +21,7 @@ if (${WITH_RBD})
   )
   add_executable(ceph_smalliobenchrbd
     ${smalliobenchrbd_srcs}
-    $<TARGET_OBJECTS:common_texttable_obj>
-    $<TARGET_OBJECTS:parse_secret_objs>
-    )
+    $<TARGET_OBJECTS:common_texttable_obj>)
   target_link_libraries(ceph_smalliobenchrbd
     librbd
     librados
diff --git a/src/test/cls_rbd/CMakeLists.txt b/src/test/cls_rbd/CMakeLists.txt
index 86c73bde7f39..d4c522a1ed58 100644
--- a/src/test/cls_rbd/CMakeLists.txt
+++ b/src/test/cls_rbd/CMakeLists.txt
@@ -1,9 +1,7 @@
 # cls_test_cls_rbd
 add_executable(ceph_test_cls_rbd
   test_cls_rbd.cc
-  $<TARGET_OBJECTS:common_texttable_obj>
-  $<TARGET_OBJECTS:parse_secret_objs>
-  )
+  $<TARGET_OBJECTS:common_texttable_obj>)
 set_target_properties(ceph_test_cls_rbd PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(ceph_test_cls_rbd
diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
index a85c2b16eda4..da103ec844df 100644
--- a/src/test/librbd/CMakeLists.txt
+++ b/src/test/librbd/CMakeLists.txt
@@ -53,9 +53,7 @@ set(unittest_librbd_srcs
 add_executable(unittest_librbd
   ${unittest_librbd_srcs}
   ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc
-  $<TARGET_OBJECTS:common_texttable_obj>
-  $<TARGET_OBJECTS:parse_secret_objs>
-  )
+  $<TARGET_OBJECTS:common_texttable_obj>)
 target_compile_definitions(unittest_librbd PUBLIC "-DTEST_LIBRBD_INTERNALS")
 set_target_properties(unittest_librbd PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -88,9 +86,7 @@ add_executable(ceph_test_librbd
   ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc
   $<TARGET_OBJECTS:librados_api_obj>
   $<TARGET_OBJECTS:librados_objs>
-  $<TARGET_OBJECTS:common_texttable_obj>
-  $<TARGET_OBJECTS:parse_secret_objs>
-  )
+  $<TARGET_OBJECTS:common_texttable_obj>)
 target_link_libraries(ceph_test_librbd
   rbd_test
   rbd_api
@@ -113,9 +109,7 @@ add_executable(ceph_test_librbd_api
   test_support.cc
   test_librbd.cc
   test_main.cc
-  $<TARGET_OBJECTS:common_texttable_obj>
-  $<TARGET_OBJECTS:parse_secret_objs>
-  )
+  $<TARGET_OBJECTS:common_texttable_obj>)
 target_link_libraries(ceph_test_librbd_api
   librbd
   librados
diff --git a/src/test/rbd_mirror/CMakeLists.txt b/src/test/rbd_mirror/CMakeLists.txt
index caa252ed0993..9ab3c0d502d9 100644
--- a/src/test/rbd_mirror/CMakeLists.txt
+++ b/src/test/rbd_mirror/CMakeLists.txt
@@ -78,8 +78,7 @@ target_link_libraries(ceph_test_rbd_mirror
   )
 
 add_executable(ceph_test_rbd_mirror_random_write
-  random_write.cc
-  $<TARGET_OBJECTS:parse_secret_objs>)
+  random_write.cc)
 set_target_properties(ceph_test_rbd_mirror_random_write PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(ceph_test_rbd_mirror_random_write