Rename CMake find_package helpers to avoid developer warnings

| CMake Warning (dev) at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:273 (message):
|   The package name passed to `find_package_handle_standard_args` (Berkeley)
|   does not match the name of the calling package (BerkeleyDB).  This can lead
|   to problems in calling code that expects `find_package` result variables
|   (e.g., `_FOUND`) to follow a certain pattern.
| Call Stack (most recent call first):
|   CMake/FindBerkeleyDB.cmake:57 (find_package_handle_standard_args)
|   CMakeLists.txt:83 (find_package)
| This warning is for project developers.  Use -Wno-dev to suppress it.

And indeed, we checked for BERKLEY_DB_FOUND which was not defined so our
HAVE_BDB was not set – just that it is never used, so it wasn't noticed.

6 files changed, 17 insertions, 17 deletions

diff --git a/CMake/FindBerkeleyDB.cmake b/CMake/FindBerkeley.cmake
index 34bc3b0d1..a6215d728 100644
--- a/CMake/FindBerkeleyDB.cmake
+++ b/CMake/FindBerkeley.cmake
@@ -1,10 +1,10 @@
 # - Try to find Berkeley DB
 # Once done this will define
 #
-#  BERKELEY_DB_FOUND - system has Berkeley DB
-#  BERKELEY_DB_INCLUDE_DIRS - the Berkeley DB include directory
-#  BERKELEY_DB_LIBRARIES - Link these to use Berkeley DB
-#  BERKELEY_DB_DEFINITIONS - Compiler switches required for using Berkeley DB
+#  BERKELEY_FOUND - system has Berkeley DB
+#  BERKELEY_INCLUDE_DIRS - the Berkeley DB include directory
+#  BERKELEY_LIBRARIES - Link these to use Berkeley DB
+#  BERKELEY_DEFINITIONS - Compiler switches required for using Berkeley DB
 
 # Copyright (c) 2006, Alexander Dymo, <adymo@kdevelop.org>
 # Copyright (c) 2016, Julian Andres Klode <jak@debian.org>
@@ -35,7 +35,7 @@
 
 # We need NO_DEFAULT_PATH here, otherwise CMake helpfully picks up the wrong
 # db.h on BSD systems instead of the Berkeley DB one.
-find_path(BERKELEY_DB_INCLUDE_DIRS db.h
+find_path(BERKELEY_INCLUDE_DIRS db.h
   ${CMAKE_INSTALL_FULL_INCLUDEDIR}/db5
   /usr/local/include/db5
   /usr/include/db5
@@ -51,9 +51,9 @@ find_path(BERKELEY_DB_INCLUDE_DIRS db.h
   NO_DEFAULT_PATH
 )
 
-find_library(BERKELEY_DB_LIBRARIES NAMES db db-5)
+find_library(BERKELEY_LIBRARIES NAMES db db-5)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Berkeley "Could not find Berkeley DB >= 4.1" BERKELEY_DB_INCLUDE_DIRS BERKELEY_DB_LIBRARIES)
-# show the BERKELEY_DB_INCLUDE_DIRS and BERKELEY_DB_LIBRARIES variables only in the advanced view
-mark_as_advanced(BERKELEY_DB_INCLUDE_DIRS BERKELEY_DB_LIBRARIES)
+find_package_handle_standard_args(Berkeley "Could not find Berkeley DB >= 4.1" BERKELEY_INCLUDE_DIRS BERKELEY_LIBRARIES)
+# show the BERKELEY_INCLUDE_DIRS and BERKELEY_LIBRARIES variables only in the advanced view
+mark_as_advanced(BERKELEY_INCLUDE_DIRS BERKELEY_LIBRARIES)
diff --git a/CMake/FindGcrypt.cmake b/CMake/FindGCRYPT.cmake
index 56bfc9fef..56bfc9fef 100644
--- a/CMake/FindGcrypt.cmake
+++ b/CMake/FindGCRYPT.cmake
diff --git a/CMake/FindSeccomp.cmake b/CMake/FindSECCOMP.cmake
index 5cfd13a37..5cfd13a37 100644
--- a/CMake/FindSeccomp.cmake
+++ b/CMake/FindSECCOMP.cmake
diff --git a/CMake/FindZstd.cmake b/CMake/FindZSTD.cmake
index 68118049b..68118049b 100644
--- a/CMake/FindZstd.cmake
+++ b/CMake/FindZSTD.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4afce7ea..51f0c25d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,8 +80,8 @@ add_optional_compile_options(Wsuggest-override)
 add_optional_compile_options(Werror=suggest-override)
 add_optional_compile_options(Werror=return-type)
 # apt-ftparchive dependencies
-find_package(BerkeleyDB REQUIRED)
-if (BERKELEY_DB_FOUND)
+find_package(Berkeley REQUIRED)
+if (BERKELEY_FOUND)
   set(HAVE_BDB 1)
 endif()
 
@@ -113,7 +113,7 @@ if (LZ4_FOUND)
   set(HAVE_LZ4 1)
 endif()
 
-find_package(Zstd)
+find_package(ZSTD)
 if (ZSTD_FOUND)
   set(HAVE_ZSTD 1)
 endif()
@@ -129,12 +129,12 @@ if (SYSTEMD_FOUND)
   set(HAVE_SYSTEMD 1)
 endif()
 
-find_package(Seccomp)
+find_package(SECCOMP)
 if (SECCOMP_FOUND)
   set(HAVE_SECCOMP 1)
 endif()
 
-find_package(Gcrypt REQUIRED)
+find_package(GCRYPT REQUIRED)
 
 # Mount()ing and stat()ing and friends
 check_symbol_exists(statfs sys/vfs.h HAVE_VFS_H)
diff --git a/ftparchive/CMakeLists.txt b/ftparchive/CMakeLists.txt
index 9aa6606f1..4af250474 100644
--- a/ftparchive/CMakeLists.txt
+++ b/ftparchive/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${BERKELEY_DB_INCLUDE_DIRS})
+include_directories(${BERKELEY_INCLUDE_DIRS})
 # Definition of the C++ files used to build the program - note that this
 # is expanded at CMake time, so you have to rerun cmake if you add or remove
 # a file (you can just run cmake . in the build directory)
@@ -6,8 +6,8 @@ file(GLOB_RECURSE source "*.cc")
 add_executable(apt-ftparchive ${source})
 
 # Link the executables against the libraries
-target_include_directories(apt-ftparchive PRIVATE ${BERKELEY_DB_INCLUDE_DIRS})
-target_link_libraries(apt-ftparchive apt-pkg apt-private ${BERKELEY_DB_LIBRARIES})
+target_include_directories(apt-ftparchive PRIVATE ${BERKELEY_INCLUDE_DIRS})
+target_link_libraries(apt-ftparchive apt-pkg apt-private ${BERKELEY_LIBRARIES})
 
 # Install the executables
 install(TARGETS apt-ftparchive RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})