cmake: build fixes

* librbd
* test/ceph_dencoder

Signed-off-by: Matt Benjamin <matt@cohortfs.com>
(cherry picked from commit 9ad02c93037c7c3f2cbe5c10791041253f349d54)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5cb9b9d211a5455fcc78041923a26ec1542af95a..d523ff1ce2db99c7554aafbe9c8fe0f38b3bed62 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -658,6 +658,7 @@ if(${WITH_RBD})
     librbd/CopyupRequest.cc
     librbd/ImageCtx.cc
     librbd/ImageWatcher.cc
+    librbd/WatchNotifyTypes.cc
     librbd/internal.cc
     librbd/librbd.cc
     librbd/LibrbdWriteback.cc

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 6e720c79c938dfbdad7e1737911cbed9833e5ea5..73e80840949e0109f70ac061ea45776cb3fc9ee5 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -92,6 +92,8 @@ target_link_libraries(test_keys mon global ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS})
 ## dencoder
 set(dencoder_srcs
   encoding/ceph_dencoder.cc
+  ${CMAKE_SOURCE_DIR}/src/krbd.cc
+  ${CMAKE_SOURCE_DIR}/src/common/secret.c
   ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
   )
 if(${WITH_RADOSGW})
@@ -106,11 +108,15 @@ endif(${WITH_RADOSGW})
 add_executable(dencoder ${dencoder_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
 target_link_libraries(dencoder
   librados
+  librbd
   global
   osd
   mds
   mon
   osdc
+  blkid
+  udev
+  keyutils
   ${EXTRALIBS}
   ${TCMALLOC_LIBS}
   ${CMAKE_DL_LIBS}
@@ -1091,6 +1097,9 @@ target_link_libraries(multi_stress_watch librados global radostest
 add_executable(test_librbd
   librbd/test_librbd.cc
   librbd/test_fixture.cc
+  librbd/test_ImageWatcher.cc
+  librbd/test_internal.cc
+  librbd/test_main.cc
   $<TARGET_OBJECTS:heap_profiler_objs>
   ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
   ${CMAKE_SOURCE_DIR}/src/common/secret.c