From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 4 May 2017 08:29:57 +0000 (+0200)
Subject: cmake: align cmake names of library packages
X-Git-Tag: v12.0.3~103^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14951%2Fhead;p=ceph.git

cmake: align cmake names of library packages

The cmake package names of libraries are case-sensitive. The name used in
FIND_PACKAGE_HANDLE_STANDARD_ARGS - e.g. "cryptopp" - must match the name used
in the module name - "Findcryptopp.cmake" - as well as the name used in
find_package() call - "find_package(cryptopp REQUIRED)"

Note that the term "package" here refers to a cmake abstraction, *not* an
actual RPM or Debian package.

Fixes: http://tracker.ceph.com/issues/19853
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/cmake/modules/Findbabeltrace.cmake b/cmake/modules/Findbabeltrace.cmake
index 76f6210578a0..6b29a246b210 100644
--- a/cmake/modules/Findbabeltrace.cmake
+++ b/cmake/modules/Findbabeltrace.cmake
@@ -16,7 +16,7 @@ find_program(BABELTRACE_EXECUTABLE
   NAMES babeltrace babeltrace-ctf)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(BABELTRACE DEFAULT_MSG
+find_package_handle_standard_args(babeltrace DEFAULT_MSG
   BABELTRACE_INCLUDE_DIR BABELTRACE_LIBRARY)
 set(BABELTRACE_LIBRARIES ${BABELTRACE_LIBRARY})
 mark_as_advanced(BABELTRACE_INCLUDE_DIR BABELTRACE_LIBRARY)
diff --git a/cmake/modules/Findcryptopp.cmake b/cmake/modules/Findcryptopp.cmake
index 74a01e83ac3d..f7c3b9b46415 100644
--- a/cmake/modules/Findcryptopp.cmake
+++ b/cmake/modules/Findcryptopp.cmake
@@ -104,5 +104,5 @@ SET (CRYPTOPP_LIBRARIES ${CRYPTOPP_LIBRARY})
 MARK_AS_ADVANCED (CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY CRYPTOPP_LIBRARY_DEBUG
   CRYPTOPP_LIBRARY_RELEASE)
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (CryptoPP REQUIRED_VARS CRYPTOPP_ROOT_DIR
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (cryptopp REQUIRED_VARS CRYPTOPP_ROOT_DIR
   CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY VERSION_VAR CRYPTOPP_VERSION)
diff --git a/cmake/modules/Findfuse.cmake b/cmake/modules/Findfuse.cmake
index 58c50cb9808e..e7a7ff08d896 100644
--- a/cmake/modules/Findfuse.cmake
+++ b/cmake/modules/Findfuse.cmake
@@ -21,7 +21,7 @@ find_library(FUSE_LIBRARIES
   PATHS /usr/local/lib64 /usr/local/lib)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(FUSE DEFAULT_MSG
+find_package_handle_standard_args(fuse DEFAULT_MSG
   FUSE_INCLUDE_DIRS FUSE_LIBRARIES)
 
 mark_as_advanced(
diff --git a/cmake/modules/Findrocksdb.cmake b/cmake/modules/Findrocksdb.cmake
index 8dbec262ff27..e1aac5741132 100644
--- a/cmake/modules/Findrocksdb.cmake
+++ b/cmake/modules/Findrocksdb.cmake
@@ -10,7 +10,7 @@ find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h)
 find_library(ROCKSDB_LIBRARIES rocksdb)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Rocksdb DEFAULT_MSG
+find_package_handle_standard_args(rocksdb DEFAULT_MSG
   ROCKSDB_LIBRARIES ROCKSDB_INCLUDE_DIR)
 
 mark_as_advanced(