cmake: fix librbd and add src/journal

librbd was missing a recently added file, src/journal was missing
entirely - this brings the build back.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 64046554f6b5c272e456b4d1e2eb8a8595b6d6e4..887479f30cca57ca4cc62c70c58a04251ffb725d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -511,6 +511,7 @@ target_link_libraries(ceph-dencoder
   mds
   mon
   osdc
+  journal
   cls_lock_client
   cls_refcount_client
   cls_log_client
@@ -519,6 +520,7 @@ target_link_libraries(ceph-dencoder
   cls_replica_log_client
   cls_kvs
   cls_user_client
+  cls_journal_client
   ${DENCODER_EXTRALIBS}
   blkid
   udev
@@ -844,6 +846,21 @@ endif(${ENABLE_SHARED})
   endif(HAVE_FUSE)
 endif(WITH_LIBCEPHFS)
 
+set(journal_srcs
+  journal/AsyncOpTracker.cc
+  journal/Entry.cc
+  journal/Future.cc
+  journal/FutureImpl.cc
+  journal/Journaler.cc
+  journal/JournalMetadata.cc
+  journal/JournalPlayer.cc
+  journal/JournalRecorder.cc
+  journal/JournalTrimmer.cc
+  journal/ObjectPlayer.cc
+  journal/ObjectRecorder.cc
+  journal/Utils.cc)
+add_library(journal ${journal_srcs})
+
 if(${WITH_RBD})
   set(librbd_srcs
     krbd.cc
@@ -862,6 +879,7 @@ if(${WITH_RBD})
     librbd/WatchNotifyTypes.cc
     librbd/internal.cc
     librbd/librbd.cc
+    librbd/LibrbdAdminSocketHook.cc
     librbd/LibrbdWriteback.cc
     librbd/ObjectMap.cc
     librbd/RebuildObjectMapRequest.cc

diff --git a/src/cls/CMakeLists.txt b/src/cls/CMakeLists.txt
index c8befd05c2a51e0e54a8417d1a2a4a5fb6b1b11e..36b2a5b828974522a61d8874e81276d02cc7453c 100644 (file)
--- a/src/cls/CMakeLists.txt
+++ b/src/cls/CMakeLists.txt
@@ -87,6 +87,17 @@ add_library(cls_user_client
   user/cls_user_types.cc
   user/cls_user_ops.cc)
 
+# cls_journal
+add_library(cls_journal SHARED
+  journal/cls_journal.cc
+  journal/cls_journal_types.cc)
+set_target_properties(cls_journal PROPERTIES VERSION "1.0.0" SOVERSION "1")
+install(TARGETS cls_journal DESTINATION lib/rados-classes)
+
+add_library(cls_journal_client
+  journal/cls_journal_client.cc
+  journal/cls_journal_types.cc)
+
 # cls_rgw
 if (WITH_RADOSGW)
   add_library(cls_rgw SHARED