From: Kefu Chai <kchai@redhat.com>
Date: Wed, 20 Jul 2016 07:29:41 +0000 (+0800)
Subject: cmake: s/HAVE_FUSE/WITH_FUSE/ s/HAVE_LIBFUSE/WITH_FUSE/
X-Git-Tag: v11.0.1~691^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c3bcb25b5b84d654735e2aa69f3cbd9bd74e9422;p=ceph-ci.git

cmake: s/HAVE_FUSE/WITH_FUSE/ s/HAVE_LIBFUSE/WITH_FUSE/

we don't define HAVE_FUSE, and HAVE_LIBFUSE is defined to be compatible
with autotools. so use WITH_FUSE in cmake whenever possible.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8a83675776..a09ed17f5af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -662,9 +662,9 @@ add_executable(ceph-osd ${ceph_osd_srcs}
   $<TARGET_OBJECTS:common_util_obj>)
 add_dependencies(ceph-osd erasure_code_plugins)
 target_link_libraries(ceph-osd osd os global ${BLKID_LIBRARIES})
-if(${HAVE_LIBFUSE})
+if(WITH_FUSE)
   target_link_libraries(ceph-osd ${FUSE_LIBRARIES})
-endif(${HAVE_LIBFUSE})
+endif()
 install(TARGETS ceph-osd DESTINATION bin)
 
 add_subdirectory(mds)
diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index e5983d74938..ad79e1b0220 100644
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -41,7 +41,7 @@ set(libos_srcs
   fs/FS.cc
   ${libos_xfs_srcs})
 
-if(HAVE_LIBFUSE)
+if(WITH_FUSE)
   list(APPEND libos_srcs
     FuseStore.cc)
 endif()
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index bfde79c24c3..9c1163b6845 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -439,7 +439,7 @@ install(TARGETS
   ceph_test_stress_watch
   DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-if(${HAVE_FUSE})
+if(WITH_FUSE)
   add_executable(ceph_test_cfuse_cache_invalidate
     test_cfuse_cache_invalidate.cc
     )
@@ -449,7 +449,7 @@ if(${HAVE_FUSE})
     ${EXTRALIBS}
     ${CMAKE_DL_LIBS}
     )
-endif(${HAVE_FUSE})
+endif(WITH_FUSE)
 
 if(${WITH_CEPHFS})
   add_executable(test_c_headers