cmake: do not link against keyutils if not necessary

Signed-off-by: Kefu Chai <kchai@redhat.com>
ceph · Aug 24, 2016 · efaf05c · efaf05c
1 parent dd0386c
commit efaf05c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 25 deletions.
diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
@@ -13,10 +13,9 @@ add_library(rbd_replay STATIC ${librbd_replay_srcs})
 target_link_libraries(rbd_replay LINK_PRIVATE librbd librados global)
 
 add_executable(rbd-replay
-  rbd-replay.cc
-  $<TARGET_OBJECTS:parse_secret_objs>
-  )
-target_link_libraries(rbd-replay librbd librados global rbd_replay rbd_replay_types common keyutils)
+  rbd-replay.cc)
+target_link_libraries(rbd-replay
+  librbd librados global rbd_replay rbd_replay_types common)
 install(TARGETS rbd-replay DESTINATION bin)
 
 set(librbd_replay_ios_srcs
@@ -34,7 +33,6 @@ if(${WITH_BABELTRACE})
     librbd
     librados
     common
-    keyutils
     global
     babeltrace
     babeltrace-ctf

diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
@@ -30,9 +30,7 @@ if (${WITH_RBD})
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     udev
     ${BLKID_LIBRARIES}
-    ${CMAKE_DL_LIBS}
-    keyutils
-    )
+    ${CMAKE_DL_LIBS})
 endif (${WITH_RBD})
 
 # ceph_smalliobenchfs

diff --git a/src/test/cls_rbd/CMakeLists.txt b/src/test/cls_rbd/CMakeLists.txt
@@ -16,9 +16,7 @@ target_link_libraries(ceph_test_cls_rbd
   ${EXTRALIBS}
   radostest
   blkid
-  udev
-  keyutils
-  )
+  udev)
 install(TARGETS
   ceph_test_cls_rbd
   DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
@@ -77,9 +77,7 @@ target_link_libraries(unittest_librbd
   osdc
   global
   ${UNITTEST_LIBS}
-  radostest
-  keyutils
-  )
+  radostest)
 
 add_executable(ceph_test_librbd
   test_main.cc
@@ -99,9 +97,7 @@ target_link_libraries(ceph_test_librbd
   osdc
   global
   ${UNITTEST_LIBS}
-  radostest
-  keyutils
-  )
+  radostest)
 set_target_properties(ceph_test_librbd PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
@@ -115,9 +111,7 @@ target_link_libraries(ceph_test_librbd_api
   librados
   common
   radostest
-  ${UNITTEST_LIBS}
-  keyutils
-  )
+  ${UNITTEST_LIBS})
 set_target_properties(ceph_test_librbd_api PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 

diff --git a/src/test/rbd_mirror/CMakeLists.txt b/src/test/rbd_mirror/CMakeLists.txt
@@ -82,8 +82,7 @@ add_executable(ceph_test_rbd_mirror_random_write
 set_target_properties(ceph_test_rbd_mirror_random_write PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(ceph_test_rbd_mirror_random_write
-  librbd librados global keyutils
-  )
+  librbd librados global)
 
 install(TARGETS
   ceph_test_rbd_mirror

diff --git a/src/tools/rbd_nbd/CMakeLists.txt b/src/tools/rbd_nbd/CMakeLists.txt
@@ -1,5 +1,4 @@
-add_executable(rbd-nbd rbd-nbd.cc
-  $<TARGET_OBJECTS:parse_secret_objs>)
-target_link_libraries(rbd-nbd librbd librados global keyutils
+add_executable(rbd-nbd rbd-nbd.cc)
+target_link_libraries(rbd-nbd librbd librados global
   ${Boost_REGEX_LIBRARY})
 install(TARGETS rbd-nbd DESTINATION bin)