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 <runsisi@zte.com.cn>

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index e7bb5ae8ffb2b7ddb0c6a65783c9a434c2a60c1f..6e30ed2e6d973cc71e57b357bf74382a1005ebf9 100644 (file)
--- 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