]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: fix rbd-nbd linkage 8889/head
authorMatt Benjamin <mbenjamin@redhat.com>
Tue, 3 May 2016 00:52:59 +0000 (20:52 -0400)
committerMatt Benjamin <mbenjamin@redhat.com>
Tue, 3 May 2016 00:52:59 +0000 (20:52 -0400)
Use correct name for librbd, add parse_secret_objs and its
keyutils libdep.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
src/CMakeLists.txt

index bf913cd30ddb256d3c12800f44c6dc66ee7e3488..1db3034d5d8686247e7aa4d169e03822a3e52db7 100644 (file)
@@ -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