summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKefu Chai <tchaikov@gmail.com>2016-05-03 07:36:14 +0200
committerKefu Chai <tchaikov@gmail.com>2016-05-03 07:36:14 +0200
commitdb129ba0b92b0886d363786fd815f6bff5c873b6 (patch)
tree19daf88ef9818caf5d320c90583430ec2f7dd004 /src
parentMerge pull request #8885 from stiopaa1/osd_removeSendMessageConn (diff)
parentcmake: fix rbd-nbd linkage (diff)
downloadceph-db129ba0b92b0886d363786fd815f6bff5c873b6.tar.xz
ceph-db129ba0b92b0886d363786fd815f6bff5c873b6.zip
Merge pull request #8889 from linuxbox2/rbd-nbd-cmake
cmake: fix rbd-nbd linkage Reviewed-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf913cd30dd..1db3034d5d8 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