From: Willem Jan Withagen <wjw@digiware.nl>
Date: Sun, 31 Jul 2016 21:35:46 +0000 (+0200)
Subject: src/CMakeLists.txt: RBD|KVS|FUSE exclude
X-Git-Tag: v11.0.1~339^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f246849120e779b7aa70affdc0ebf2b0372e9eb2;p=ceph.git

src/CMakeLists.txt: RBD|KVS|FUSE exclude

 - krbd is the Linux kernel RBD driver, and that is not going to be
   ported to FreeBSD in its current state. If anything it will be
   a module based on a derivative  of gated.
 - The current secret.c depends on keyutils
   Which is an interesting concept, but still needs to be ported to
   FreeBSD one way or another.
 - ceph-dencoder can live without these modules on FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9cec3aa974e4..079bdb7dcbb8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -605,11 +605,20 @@ if(${WITH_RADOSGW})
     cls_rgw_client
   )
 endif(${WITH_RADOSGW})
-if(${WITH_RBD})
+if(WITH_RBD)
   set(DENCODER_EXTRALIBS
       ${DENCODER_EXTRALIBS}
       rbd_replay_types)
-endif(${WITH_RBD})
+  if(LINUX)
+    list(APPEND dencoder_srcs
+      $<TARGET_OBJECTS:krbd_objs>
+      $<TARGET_OBJECTS:parse_secret_objs>)
+    set(DENCODER_EXTRALIBS
+      ${DENCODER_EXTRALIBS}
+      keyutils
+      udev)
+  endif(LINUX)
+endif(WITH_RBD)
 
 add_executable(ceph-dencoder ${dencoder_srcs})
 target_link_libraries(ceph-dencoder
@@ -801,7 +810,7 @@ if(WITH_LIBCEPHFS)
   install(TARGETS ceph-syn DESTINATION bin)
   install(TARGETS mount.ceph DESTINATION ${CMAKE_INSTALL_SBINDIR})
 
-  if(HAVE_LIBFUSE)
+  if(WITH_FUSE)
     set(ceph_fuse_srcs
       ceph_fuse.cc
       client/fuse_ll.cc)
@@ -810,7 +819,7 @@ if(WITH_LIBCEPHFS)
     set_target_properties(ceph-fuse PROPERTIES COMPILE_FLAGS "-I${FUSE_INCLUDE_DIRS}")
     install(TARGETS ceph-fuse DESTINATION bin)
     install(PROGRAMS mount.fuse.ceph DESTINATION ${CMAKE_INSTALL_SBINDIR})
-  endif(HAVE_LIBFUSE)
+  endif(WITH_FUSE)
 endif(WITH_LIBCEPHFS)
 
 add_subdirectory(journal)
@@ -836,7 +845,7 @@ if(WITH_KVS)
   add_subdirectory(key_value_store)
 endif(WITH_KVS)
 
-if(${WITH_RADOSGW})
+if(WITH_RADOSGW)
   set(civetweb_common_files civetweb/src/civetweb.c)
   add_library(civetweb_common_objs OBJECT ${civetweb_common_files})
   target_include_directories(civetweb_common_objs PUBLIC
@@ -848,7 +857,7 @@ if(${WITH_RADOSGW})
       "${SSL_INCLUDE_DIR}")
   endif(HAVE_SSL)
   add_subdirectory(rgw)
-endif(${WITH_RADOSGW})
+endif(WITH_RADOSGW)
 
 install(FILES
   sample.ceph.conf