From: Kefu Chai Date: Fri, 17 Apr 2020 05:02:22 +0000 (+0800) Subject: cmake: rename Findfuse.cmake to FindFUSE.cmake X-Git-Tag: v15.2.2~12^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e84aa4c1aeec3d124436f88c8465f904be8ac5e8;p=ceph.git cmake: rename Findfuse.cmake to FindFUSE.cmake so its name is consistent with upstream name, and with the variables exposed by FindFUSE.cmake. Signed-off-by: Kefu Chai (cherry picked from commit 2b3adb5c5ee518cf4f03d1f96256f411aec1def2) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b2dc184e6ae..6d539f18161 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,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 index 00000000000..58c50cb9808 --- /dev/null +++ b/cmake/modules/FindFUSE.cmake @@ -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 index e7a7ff08d89..00000000000 --- a/cmake/modules/Findfuse.cmake +++ /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)