From 035e872680c71b220dccf270a3e55542204e579d Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 21 Nov 2018 08:04:31 -0500 Subject: [PATCH] cmake: dont build ceph-mds if WITH_CEPHFS=OFF Signed-off-by: Casey Bodley --- src/CMakeLists.txt | 20 ++++++++++++-------- src/test/CMakeLists.txt | 8 ++++++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f999f877a69..cbeb57a17a5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -512,13 +512,15 @@ set_target_properties(ceph-osd PROPERTIES POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) install(TARGETS ceph-osd DESTINATION bin) -add_subdirectory(mds) -set(ceph_mds_srcs - ceph_mds.cc) -add_executable(ceph-mds ${ceph_mds_srcs}) -target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common - Boost::thread) -install(TARGETS ceph-mds DESTINATION bin) +if (WITH_CEPHFS) + add_subdirectory(mds) + set(ceph_mds_srcs + ceph_mds.cc) + add_executable(ceph-mds ${ceph_mds_srcs}) + target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common + Boost::thread) + install(TARGETS ceph-mds DESTINATION bin) +endif() add_subdirectory(erasure-code) @@ -739,8 +741,10 @@ add_custom_target(vstart-base DEPENDS add_custom_target(vstart DEPENDS vstart-base - ceph-mds cython${PY_BINDING_INFIX}_rbd) +if (WITH_CEPHFS) + add_dependencies(vstart ceph-mds) +endif() if(WITH_RADOSGW) add_dependencies(vstart radosgw radosgw-admin) endif(WITH_RADOSGW) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index f9eb45b5bd8..1e47535e984 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -38,7 +38,9 @@ if(WITH_RBD) add_subdirectory(librbd) endif(WITH_RBD) add_subdirectory(messenger) -add_subdirectory(mds) +if (WITH_CEPHFS) + add_subdirectory(mds) +endif() add_subdirectory(mon) add_subdirectory(mgr) add_subdirectory(msgr) @@ -485,7 +487,6 @@ add_dependencies(tests crushtool ceph-conf rados - ceph-mds monmaptool ceph-osd ceph-dencoder @@ -500,6 +501,9 @@ add_dependencies(tests ceph_erasure_code_non_regression ceph_erasure_code cython${PY_BINDING_INFIX}_modules) +if (WITH_CEPHFS) + add_dependencies(tests ceph-mds) +endif() if(WITH_MGR) add_dependencies(tests ceph-mgr) endif() -- 2.39.5