]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: rename Findfuse.cmake to FindFUSE.cmake
authorKefu Chai <kchai@redhat.com>
Fri, 17 Apr 2020 05:02:22 +0000 (13:02 +0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 27 Apr 2020 11:56:18 +0000 (13:56 +0200)
so its name is consistent with upstream name, and with the variables
exposed by FindFUSE.cmake.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 2b3adb5c5ee518cf4f03d1f96256f411aec1def2)

CMakeLists.txt
cmake/modules/FindFUSE.cmake [new file with mode: 0644]
cmake/modules/Findfuse.cmake [deleted file]

index 10efbb5bb6b79350ca922ff12f5b8fa991aba820..16430a792240be0f9def9a1765a5504ca8c30963 100644 (file)
@@ -253,7 +253,7 @@ endif()
 
 option(WITH_FUSE "Fuse is here" ON)
 if(WITH_FUSE)
-  find_package(fuse)
+  find_package(FUSE)
   set(HAVE_LIBFUSE ${FUSE_FOUND})
 endif()
 
diff --git a/cmake/modules/FindFUSE.cmake b/cmake/modules/FindFUSE.cmake
new file mode 100644 (file)
index 0000000..58c50cb
--- /dev/null
@@ -0,0 +1,28 @@
+# This module can find FUSE Library
+#
+# The following variables will be defined for your use:
+# - FUSE_FOUND : was FUSE found?
+# - FUSE_INCLUDE_DIRS : FUSE include directory
+# - FUSE_LIBRARIES : FUSE library
+
+find_path(
+    FUSE_INCLUDE_DIRS
+    NAMES fuse_common.h fuse_lowlevel.h fuse.h
+    PATHS /usr/local/include/osxfuse /usr/local/include
+    PATH_SUFFIXES fuse)
+
+set(fuse_names fuse)
+if(APPLE)
+  list(APPEND fuse_names libosxfuse.dylib)
+endif()
+
+find_library(FUSE_LIBRARIES
+  NAMES ${fuse_names}
+  PATHS /usr/local/lib64 /usr/local/lib)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FUSE DEFAULT_MSG
+  FUSE_INCLUDE_DIRS FUSE_LIBRARIES)
+
+mark_as_advanced(
+  FUSE_INCLUDE_DIRS FUSE_LIBRARIES)
diff --git a/cmake/modules/Findfuse.cmake b/cmake/modules/Findfuse.cmake
deleted file mode 100644 (file)
index e7a7ff0..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# This module can find FUSE Library
-#
-# The following variables will be defined for your use:
-# - FUSE_FOUND : was FUSE found?
-# - FUSE_INCLUDE_DIRS : FUSE include directory
-# - FUSE_LIBRARIES : FUSE library
-
-find_path(
-    FUSE_INCLUDE_DIRS
-    NAMES fuse_common.h fuse_lowlevel.h fuse.h
-    PATHS /usr/local/include/osxfuse /usr/local/include
-    PATH_SUFFIXES fuse)
-
-set(fuse_names fuse)
-if(APPLE)
-  list(APPEND fuse_names libosxfuse.dylib)
-endif()
-
-find_library(FUSE_LIBRARIES
-  NAMES ${fuse_names}
-  PATHS /usr/local/lib64 /usr/local/lib)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(fuse DEFAULT_MSG
-  FUSE_INCLUDE_DIRS FUSE_LIBRARIES)
-
-mark_as_advanced(
-  FUSE_INCLUDE_DIRS FUSE_LIBRARIES)