From 93e5d787ef10410724cb3a19c0529107ee7e4c7d Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Mon, 4 Jul 2022 20:57:29 +0530 Subject: [PATCH] cmake: add rbd-mirror executable to run-make-check Signed-off-by: Deepika Upadhyay (cherry picked from commit e2b46020317e4d4e37c281a6b1817711e0826a37) --- CMakeLists.txt | 3 +++ run-make-check.sh | 1 + src/test/CMakeLists.txt | 3 +++ src/tools/rbd_mirror/CMakeLists.txt | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0870323a94..a8206289b3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -244,6 +244,9 @@ if(WITH_BLUESTORE_PMEM) set(HAVE_LIBDML ${DML_FOUND}) endif() +CMAKE_DEPENDENT_OPTION(WITH_RBD_MIRROR "Enable build for rbd-mirror daemon executable" OFF + "WITH_RBD" OFF) + CMAKE_DEPENDENT_OPTION(WITH_RBD_MIGRATION_FORMAT_QCOW_V1 "Enable librbd QCOW v1 migration format support" ON "WITH_RBD" OFF) diff --git a/run-make-check.sh b/run-make-check.sh index a67145a4d28..f425c85145c 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -91,6 +91,7 @@ function main() { cmake_opts+=" -DWITH_GRAFANA=ON" cmake_opts+=" -DWITH_SPDK=ON" cmake_opts+=" -DWITH_RADOSGW_MOTR=ON" + cmake_opts+=" -DWITH_RBD_MIRROR=ON" if [ $WITH_SEASTAR ]; then cmake_opts+=" -DWITH_SEASTAR=ON" fi diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 54c49970ebc..308c0e0170a 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -575,6 +575,9 @@ if(WITH_RBD) if(FREEBSD) add_dependencies(tests rbd-ggate) endif(FREEBSD) + if(WITH_RBD_MIRROR) + add_dependencies(tests unittest_librbd rbd-mirror) + endif(WITH_RBD_MIRROR) endif(WITH_RBD) if(WITH_RADOSGW) add_dependencies(tests radosgwd radosgw-admin) diff --git a/src/tools/rbd_mirror/CMakeLists.txt b/src/tools/rbd_mirror/CMakeLists.txt index f260d978632..43a6f03fe96 100644 --- a/src/tools/rbd_mirror/CMakeLists.txt +++ b/src/tools/rbd_mirror/CMakeLists.txt @@ -87,4 +87,5 @@ target_link_libraries(rbd-mirror heap_profiler ${ALLOC_LIBS} OpenSSL::SSL) -install(TARGETS rbd-mirror DESTINATION bin) +install(TARGETS rbd-mirror + DESTINATION ${CMAKE_INSTALL_BINDIR}) -- 2.39.5