]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cmake: dont build ceph-mds if WITH_CEPHFS=OFF
authorCasey Bodley <cbodley@redhat.com>
Wed, 21 Nov 2018 13:04:31 +0000 (08:04 -0500)
committerCasey Bodley <cbodley@redhat.com>
Wed, 21 Nov 2018 14:15:07 +0000 (09:15 -0500)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/CMakeLists.txt
src/test/CMakeLists.txt

index f999f877a69161e59f8388ef7f6496f7809cff15..cbeb57a17a5c1296b9de4ccc6bb5c183d1816710 100644 (file)
@@ -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)
index f9eb45b5bd8c7071a729c893dd844ed3bc7eaf28..1e47535e984074d4d9a66a0933611d0013960b6c 100644 (file)
@@ -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()