From bfa2653fd814e2464c60aac6b94b9cc92ea7bde6 Mon Sep 17 00:00:00 2001 From: runsisi Date: Tue, 16 Jan 2018 18:29:34 +0800 Subject: [PATCH] build/ops: move ceph-osdomap-tool, ceph-monstore-tool out of ceph-test build rpm with --without ceph_test_package should fail[1][2] since -DWITH_TESTS=OFF is defined [1] https://github.com/ceph/ceph/blob/master/ceph.spec.in#L1254 [2] https://github.com/ceph/ceph/blob/master/ceph.spec.in#L1423 Signed-off-by: runsisi --- 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