From e020ec334309de7c0a46058e7c7fcbb0ef44d5b8 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 24 Nov 2017 08:51:38 +0100 Subject: [PATCH] build/ops: cmake: do not guard certain tools with WITH_TESTS As a follow-up to d7b493a7108a68302bc0f48337bf3c253a720266 we need to stop guarding ceph-osdomap-tool ceph-monstore-tool with WITH_TESTS because they have been moved out of the ceph-test package. (N.B. ceph-kvstore-tool was also moved out of ceph-test, but apparently never had the guard.) Signed-off-by: Nathan Cutler --- src/tools/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index e7bb5ae8ffb..6e30ed2e6d9 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -22,6 +22,11 @@ add_executable(ceph_radosacl radosacl.cc) target_link_libraries(ceph_radosacl librados global) install(TARGETS ceph_radosacl DESTINATION bin) +install(PROGRAMS + ceph-monstore-update-crush.sh + DESTINATION ${CMAKE_INSTALL_LIBDIR}/ceph) +endif(WITH_TESTS) + add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) target_link_libraries(ceph-osdomap-tool os global Boost::program_options) install(TARGETS ceph-osdomap-tool DESTINATION bin) @@ -31,10 +36,6 @@ add_executable(ceph-monstore-tool ../mgr/mgr_commands.cc) target_link_libraries(ceph-monstore-tool os global Boost::program_options) install(TARGETS ceph-monstore-tool DESTINATION bin) -install(PROGRAMS - ceph-monstore-update-crush.sh - DESTINATION ${CMAKE_INSTALL_LIBDIR}/ceph) -endif(WITH_TESTS) add_executable(ceph-objectstore-tool ceph_objectstore_tool.cc -- 2.39.5