Merge pull request #3834 from linuxbox2/xio-build

cmake: build fixes Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Feb 28, 2015 · 3b424bf · 3b424bf
2 parents 721b3a0 + 9ad02c9
commit 3b424bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git 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
@@ -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