]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: Fix CMakelist.txt to remove depleted files 3414/head
authorVu Pham <vu@mellanox.com>
Mon, 19 Jan 2015 15:28:31 +0000 (07:28 -0800)
committerVu Pham <vu@mellanox.com>
Mon, 19 Jan 2015 20:56:48 +0000 (12:56 -0800)
- remove depleted tools/ceph_mon_store_converter_srcs
- replace librbd source file (WatchCtx.cc to ImageWatcher.cc)

Signed-off-by: Vu Pham <vu@mellanox.com>
src/CMakeLists.txt

index a055d2cedb3fbba186c89b98586ccc05fcff88e2..89cd62e32b293234aa9c674adbc7d93a445c6fe7 100644 (file)
@@ -556,13 +556,6 @@ add_executable(ceph-authtool ${ceph_authtool_srcs})
 target_link_libraries(ceph-authtool global ${EXTRALIBS})
 install(TARGETS ceph-authtool DESTINATION bin)
 
-set(ceph_mon_store_converter_srcs
-  tools/mon_store_converter.cc)
-add_executable(ceph_mon_store_converter ${ceph_mon_store_converter_srcs}
-  $<TARGET_OBJECTS:monitorstore_obj>)
-target_link_libraries(ceph_mon_store_converter os global)
-install(TARGETS ceph_mon_store_converter DESTINATION bin)
-
 configure_file(${CMAKE_SOURCE_DIR}/src/ceph-coverage.in
   ${CMAKE_BINARY_DIR}/ceph-coverage @ONLY)
 
@@ -657,7 +650,7 @@ if(${WITH_RBD})
     librbd/ImageCtx.cc
     librbd/internal.cc
     librbd/LibrbdWriteback.cc
-    librbd/WatchCtx.cc)
+    librbd/ImageWatcher.cc)
   add_library(librbd ${CEPH_SHARED} ${librbd_srcs}
     $<TARGET_OBJECTS:osdc_rbd_objs>
     $<TARGET_OBJECTS:common_util_obj>)