From 0b27024698012ce3438cbfd04d692ef710a8e495 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Mon, 21 Sep 2015 12:44:28 -0400 Subject: [PATCH] CMake - fix check for FUSE Signed-off-by: Daniel Gryniewicz --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 4 ++-- src/test/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9353a48ceeda..c73fa4076524c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,8 +104,8 @@ endif(${WITH_AIO}) option(WITH_FUSE "Fuse is here" ON) if(${WITH_FUSE}) -find_package(fuse REQUIRED) -set(HAVE_LIBFUSE ${FUSE_FOUND}) +find_package(fuse) +set(HAVE_FUSE ${FUSE_FOUND}) CHECK_FUNCTION_EXISTS(fuse_getgroups HAVE_FUSE_GETGROUPS) endif(${WITH_FUSE}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 058f52084b65a..6339063cb6078 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -812,7 +812,7 @@ endif(${ENABLE_SHARED}) install(TARGETS ceph-syn DESTINATION bin) install(TARGETS mount.ceph DESTINATION sbin) - if(WITH_FUSE) + if(HAVE_FUSE) set(ceph_fuse_srcs ceph_fuse.cc client/fuse_ll.cc) @@ -820,7 +820,7 @@ endif(${ENABLE_SHARED}) target_link_libraries(ceph-fuse fuse client global) set_target_properties(ceph-fuse PROPERTIES COMPILE_FLAGS "-I${FUSE_INCLUDE_DIRS}") install(TARGETS ceph-fuse DESTINATION bin) - endif(WITH_FUSE) + endif(HAVE_FUSE) endif(WITH_LIBCEPHFS) if(${WITH_RBD}) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 413b4e2dad7b3..2edffcf907547 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -2164,7 +2164,7 @@ target_link_libraries(test_keyvaluedb_iterators ${CMAKE_DL_LIBS} ) -if(${WITH_FUSE}) +if(${HAVE_FUSE}) add_executable(test_cfuse_cache_invalidate test_cfuse_cache_invalidate.cc ) @@ -2175,7 +2175,7 @@ if(${WITH_FUSE}) ${TCMALLOC_LIBS} ${CMAKE_DL_LIBS} ) -endif(${WITH_FUSE}) +endif(${HAVE_FUSE}) if(${WITH_CEPHFS}) add_executable(test_c_headers -- 2.39.5