From: Matt Benjamin <mbenjamin@redhat.com>
Date: Tue, 3 May 2016 00:52:59 +0000 (-0400)
Subject: cmake: fix rbd-nbd linkage
X-Git-Tag: v11.0.0~758^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b233005a745a92c65276536e220e57b50c789744;p=ceph.git

cmake: fix rbd-nbd linkage

Use correct name for librbd, add parse_secret_objs and its
keyutils libdep.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf913cd30ddb..1db3034d5d86 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1005,8 +1005,10 @@ add_library(krbd_objs OBJECT krbd.cc)
 if(${WITH_RBD})
   add_subdirectory(librbd)
   
-  add_executable(rbd-nbd tools/rbd_nbd/rbd-nbd.cc)
-  target_link_libraries(rbd-nbd rbd librados global ${Boost_REGEX_LIBRARY})
+  add_executable(rbd-nbd tools/rbd_nbd/rbd-nbd.cc
+    $<TARGET_OBJECTS:parse_secret_objs>)
+  target_link_libraries(rbd-nbd librbd librados global keyutils
+    ${Boost_REGEX_LIBRARY})
 
   set(rbd_mirror_internal
     tools/rbd_mirror/ClusterWatcher.cc