From: Ali Maredia <amaredia@redhat.com>
Date: Thu, 31 Dec 2015 22:46:04 +0000 (-0500)
Subject: cmake: rbd_replay CMakeLists.txt, rbd_replay fixes
X-Git-Tag: v10.0.3~134^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbf7641259997be28d7f49dec5e11e3831d04407;p=ceph.git

cmake: rbd_replay CMakeLists.txt, rbd_replay fixes

moved rbd_replay targets into it's directory,
rbd-replay-prep added, removed "lib" in front of
all rbd_replay libraries, linked rbd_replay into
ceph-dencoder.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6541036099f2..3337c7e89ae0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -520,7 +520,7 @@ endif(${WITH_RADOSGW})
 if(${WITH_RBD})
   set(DENCODER_EXTRALIBS
       ${DENCODER_EXTRALIBS}
-      librbd_replay_types)
+      rbd_replay_types)
 endif(${WITH_RBD})
 target_link_libraries(ceph-dencoder
   librados
@@ -544,6 +544,7 @@ target_link_libraries(ceph-dencoder
   blkid
   udev
   keyutils
+  rbd_replay
   ${EXTRALIBS}
   ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
@@ -1022,35 +1023,7 @@ if(${WITH_RBD})
   install(TARGETS rbd DESTINATION bin)
   install(PROGRAMS ${CMAKE_SOURCE_DIR}/src/ceph-rbdnamer DESTINATION bin)
   install(PROGRAMS ${CMAKE_SOURCE_DIR}/src/rbdmap DESTINATION bin)
-
-  set(librbd_replay_types_srcs
-      rbd_replay/ActionTypes.cc)
-  add_library(librbd_replay_types STATIC ${librbd_replay_types_srcs})
-
-  set(librbd_replay_srcs
-      rbd_replay/actions.cc
-      rbd_replay/BufferReader.cc
-      rbd_replay/ImageNameMap.cc
-      rbd_replay/PendingIO.cc
-      rbd_replay/rbd_loc.cc
-      rbd_replay/Replayer.cc)
-  add_library(librbd_replay STATIC ${librbd_replay_srcs})
-  target_link_libraries(librbd_replay PRIVATE librbd_replay_types librbd librados global udev)
-
-  add_executable(rbd_replay
-    rbd_replay/rbd-replay.cc
-    $<TARGET_OBJECTS:parse_secret_objs>
-    )
-  target_link_libraries(rbd_replay librbd librados global librbd_replay keyutils)
-  install(TARGETS rbd_replay DESTINATION bin)
-
-  set(librbd_replay_ios_srcs
-      rbd_replay/ios.cc)
-  add_library(librbd_replay_ios STATIC ${librbd_replay_ios_srcs})
-  target_link_libraries(librbd_replay_ios librbd librados global)
-
-  install(TARGETS librbd_replay librbd_replay_ios DESTINATION lib)
-
+  add_subdirectory(rbd_replay)
 endif(${WITH_RBD})
 
 # RadosGW
diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
new file mode 100644
index 000000000000..b6608f031da7
--- /dev/null
+++ b/src/rbd_replay/CMakeLists.txt
@@ -0,0 +1,52 @@
+set(librbd_replay_types_srcs
+    ActionTypes.cc)
+add_library(rbd_replay_types STATIC ${librbd_replay_types_srcs})
+
+set(librbd_replay_srcs
+    actions.cc
+    BufferReader.cc
+    ImageNameMap.cc
+    PendingIO.cc
+    rbd_loc.cc
+    Replayer.cc)
+add_library(rbd_replay STATIC ${librbd_replay_srcs})
+target_link_libraries(rbd_replay PRIVATE librbd librados global)
+
+add_executable(rbd-replay
+  rbd-replay.cc
+  $<TARGET_OBJECTS:parse_secret_objs>
+  )
+target_link_libraries(rbd-replay librbd librados global rbd_replay rbd_replay_types common keyutils)
+install(TARGETS rbd-replay DESTINATION bin)
+
+set(librbd_replay_ios_srcs
+    ios.cc)
+add_library(rbd_replay_ios STATIC ${librbd_replay_ios_srcs})
+target_link_libraries(rbd_replay_ios librbd librados global)
+
+if(${WITH_BABELTRACE})
+  set(rbd_replay_prep_srcs
+      rbd-replay-prep.cc)
+  add_executable(rbd-replay-prep
+    ${rbd_replay_prep_srcs}
+    $<TARGET_OBJECTS:parse_secret_objs>
+    )
+  target_link_libraries(rbd-replay-prep
+    rbd_replay
+    rbd_replay_ios
+    rbd_replay_types
+    librbd
+    librados
+    common
+    keyutils
+    global
+    babeltrace
+    babeltrace-ctf
+    udev
+    ${Boost_DATE_TIME_LIBRARY}
+    )
+  install(TARGETS rbd-replay-prep DESTINATION bin)
+endif(${WITH_BABELTRACE})
+
+install(TARGETS rbd_replay rbd_replay_ios DESTINATION lib)
+