Merge pull request #10186 from ceph/wip-cmake-no-with-mds

cmake: remove WITH_MDS option Reviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Ken Dreyer <kdreyer@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Jul 8, 2016 · 07387eb · 07387eb
2 parents 33fb3bc + cfcf070
commit 07387eb
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 58 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -198,9 +198,6 @@ endif(WITH_SPDK)
 
 find_package(blkid REQUIRED)
 
-# probably fuse etc need this -- how to check? XXX
-option(WITH_MDS "MDS is here" ON)
-
 # needs mds and? XXX
 option(WITH_LIBCEPHFS "libcephfs client library" ON)
 

diff --git a/doc/man/8/CMakeLists.txt b/doc/man/8/CMakeLists.txt
@@ -32,13 +32,9 @@ list(APPEND man_srcs
   ${server_srcs}
   ${osd_srcs}
   ${mon_srcs}
+  ceph-mds.rst
   librados-config.rst)
 
-if(WITH_MDS)
-  list(APPEND man_srcs
-    ceph-mds.rst)
-endif()
-
 if(WITH_CEPHFS)
   list(APPEND man_srcs
     cephfs.rst)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -952,56 +952,54 @@ endif(${HAVE_LIBFUSE})
 install(TARGETS ceph-osd DESTINATION bin)
 
 # MDS
-if(${WITH_MDS})
-  set(mds_srcs
-    mds/Capability.cc
-    mds/MDSDaemon.cc
-    mds/MDSRank.cc
-    mds/Beacon.cc
-    mds/flock.cc
-    mds/locks.c
-    mds/journal.cc
-    mds/Server.cc
-    mds/Mutation.cc
-    mds/MDCache.cc
-    mds/RecoveryQueue.cc
-    mds/StrayManager.cc
-    mds/Locker.cc
-    mds/Migrator.cc
-    mds/MDBalancer.cc
-    mds/CDentry.cc
-    mds/CDir.cc
-    mds/CInode.cc
-    mds/LogEvent.cc
-    mds/MDSTable.cc
-    mds/InoTable.cc
-    mds/JournalPointer.cc
-    mds/MDSTableClient.cc
-    mds/MDSTableServer.cc
-    mds/ScrubStack.cc
-    mds/DamageTable.cc
-    mds/SimpleLock.cc
-    mds/SnapRealm.cc
-    mds/SnapServer.cc
-    mds/snap.cc
-    mds/SessionMap.cc
-    mds/MDSContext.cc
-    mds/MDSAuthCaps.cc
-    mds/MDLog.cc
-    ${CMAKE_SOURCE_DIR}/src/common/TrackedOp.cc
-    ${CMAKE_SOURCE_DIR}/src/osdc/Journaler.cc)
-  add_library(mds STATIC ${mds_srcs}
-    $<TARGET_OBJECTS:heap_profiler_objs>
-    $<TARGET_OBJECTS:common_util_obj>)
-  target_link_libraries(mds ${ALLOC_LIBS} osdc common)
-  set(ceph_mds_srcs
-    ceph_mds.cc)
-  add_executable(ceph-mds ${ceph_mds_srcs}
-    $<TARGET_OBJECTS:common_util_obj>)
-  target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global
-    ${Boost_THREAD_LIBRARY})
-  install(TARGETS ceph-mds DESTINATION bin)
-endif(${WITH_MDS})
+set(mds_srcs
+  mds/Capability.cc
+  mds/MDSDaemon.cc
+  mds/MDSRank.cc
+  mds/Beacon.cc
+  mds/flock.cc
+  mds/locks.c
+  mds/journal.cc
+  mds/Server.cc
+  mds/Mutation.cc
+  mds/MDCache.cc
+  mds/RecoveryQueue.cc
+  mds/StrayManager.cc
+  mds/Locker.cc
+  mds/Migrator.cc
+  mds/MDBalancer.cc
+  mds/CDentry.cc
+  mds/CDir.cc
+  mds/CInode.cc
+  mds/LogEvent.cc
+  mds/MDSTable.cc
+  mds/InoTable.cc
+  mds/JournalPointer.cc
+  mds/MDSTableClient.cc
+  mds/MDSTableServer.cc
+  mds/ScrubStack.cc
+  mds/DamageTable.cc
+  mds/SimpleLock.cc
+  mds/SnapRealm.cc
+  mds/SnapServer.cc
+  mds/snap.cc
+  mds/SessionMap.cc
+  mds/MDSContext.cc
+  mds/MDSAuthCaps.cc
+  mds/MDLog.cc
+  ${CMAKE_SOURCE_DIR}/src/common/TrackedOp.cc
+  ${CMAKE_SOURCE_DIR}/src/osdc/Journaler.cc)
+add_library(mds STATIC ${mds_srcs}
+  $<TARGET_OBJECTS:heap_profiler_objs>
+  $<TARGET_OBJECTS:common_util_obj>)
+target_link_libraries(mds ${ALLOC_LIBS} osdc common)
+set(ceph_mds_srcs
+  ceph_mds.cc)
+add_executable(ceph-mds ${ceph_mds_srcs}
+  $<TARGET_OBJECTS:common_util_obj>)
+target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global
+  ${Boost_THREAD_LIBRARY})
+install(TARGETS ceph-mds DESTINATION bin)
 
 add_subdirectory(erasure-code)