petk · petk · Nov 9, 2024 · Nov 9, 2024 · Nov 9, 2024 · Nov 9, 2024
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -80,7 +80,6 @@ jobs:
             libfreetype-dev \
             libldap2-dev \
             unixodbc-dev \
-            libodbc2 \
             freetds-dev \
             libsnmp-dev \
             snmp \

diff --git a/cmake/cmake/modules/FindACL.cmake b/cmake/cmake/modules/FindACL.cmake
@@ -143,7 +143,9 @@ else()
 
   # Use pkgconf, if available on the system.
   find_package(PkgConfig QUIET)
-  pkg_check_modules(PC_ACL QUIET libacl)
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_ACL QUIET libacl)
+  endif()
 
   find_path(
     ACL_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindApache.cmake b/cmake/cmake/modules/FindApache.cmake
@@ -193,7 +193,9 @@ endif()
 # Find the apr library (Apache portable runtime).
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Apache_APR QUIET apr-1)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Apache_APR QUIET apr-1)
+endif()
 
 find_path(
   Apache_APR_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindAppArmor.cmake b/cmake/cmake/modules/FindAppArmor.cmake
@@ -37,7 +37,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_AppArmor QUIET libapparmor)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_AppArmor QUIET libapparmor)
+endif()
 
 find_path(
   AppArmor_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindArgon2.cmake b/cmake/cmake/modules/FindArgon2.cmake
@@ -36,7 +36,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Argon2 QUIET libargon2)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Argon2 QUIET libargon2)
+endif()
 
 find_path(
   Argon2_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindCapstone.cmake b/cmake/cmake/modules/FindCapstone.cmake
@@ -36,7 +36,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Capstone QUIET capstone)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Capstone QUIET capstone)
+endif()
 
 find_path(
   Capstone_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindCdb.cmake b/cmake/cmake/modules/FindCdb.cmake
@@ -37,7 +37,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Cdb QUIET libcdb)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Cdb QUIET libcdb)
+endif()
 
 find_path(
   Cdb_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindCrypt.cmake b/cmake/cmake/modules/FindCrypt.cmake
@@ -85,7 +85,9 @@ else()
 
   # Use pkgconf, if available on the system.
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_Crypt QUIET libcrypt libxcrypt)
+  if(PKG_CONFIG_FOUND)
+    pkg_search_module(PC_Crypt QUIET libcrypt libxcrypt)
+  endif()
 
   find_path(
     Crypt_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindEditline.cmake b/cmake/cmake/modules/FindEditline.cmake
@@ -37,7 +37,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Editline QUIET libedit)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Editline QUIET libedit)
+endif()
 
 find_path(
   Editline_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindEnchant.cmake b/cmake/cmake/modules/FindEnchant.cmake
@@ -43,7 +43,9 @@ endif()
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Enchant QUIET ${_enchant_name})
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Enchant QUIET ${_enchant_name})
+endif()
 
 find_path(
   Enchant_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindFFI.cmake b/cmake/cmake/modules/FindFFI.cmake
@@ -36,7 +36,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_FFI QUIET libffi)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_FFI QUIET libffi)
+endif()
 
 find_path(
   FFI_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindGD.cmake b/cmake/cmake/modules/FindGD.cmake
@@ -36,7 +36,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_GD QUIET gdlib)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_GD QUIET gdlib)
+endif()
 
 find_path(
   GD_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindGMP.cmake b/cmake/cmake/modules/FindGMP.cmake
@@ -36,7 +36,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_GMP QUIET gmp)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_GMP QUIET gmp)
+endif()
 
 find_path(
   GMP_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindICU.cmake b/cmake/cmake/modules/FindICU.cmake
@@ -20,17 +20,19 @@ set_package_properties(
 )
 
 # If available, use pkgconf and append paths to the internal icu_roots variable.
-foreach(component ${ICU_FIND_COMPONENTS})
-  find_package(PkgConfig QUIET)
-  string(TOUPPER ${component} component_upper)
-  pkg_check_modules(PC_ICU_${component_upper} QUIET icu-${component})
-
-  list(APPEND icu_roots ${PC_ICU_${component_upper}_INCLUDE_DIRS})
-  list(APPEND icu_roots ${PC_ICU_${component_upper}_LIBRARY_DIRS})
-endforeach()
-
-if(icu_roots)
-  list(REMOVE_DUPLICATES icu_roots)
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  foreach(component ${ICU_FIND_COMPONENTS})
+    string(TOUPPER ${component} component_upper)
+    pkg_check_modules(PC_ICU_${component_upper} QUIET icu-${component})
+
+    list(APPEND icu_roots ${PC_ICU_${component_upper}_INCLUDE_DIRS})
+    list(APPEND icu_roots ${PC_ICU_${component_upper}_LIBRARY_DIRS})
+  endforeach()
+
+  if(icu_roots)
+    list(REMOVE_DUPLICATES icu_roots)
+  endif()
 endif()
 
 # Find package with upstream CMake module; override CMAKE_MODULE_PATH to prevent

diff --git a/cmake/cmake/modules/FindKerberos.cmake b/cmake/cmake/modules/FindKerberos.cmake
@@ -46,7 +46,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Kerberos QUIET krb5)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Kerberos QUIET krb5)
+endif()
 
 find_path(
   Kerberos_INCLUDE_DIR
@@ -115,7 +117,9 @@ block(PROPAGATE Kerberos_VERSION)
 endblock()
 
 # Find Kerberos GSSAPI component.
-pkg_check_modules(PC_Kerberos_GSSAPI QUIET krb5-gssapi)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Kerberos_GSSAPI QUIET krb5-gssapi)
+endif()
 
 find_path(
   Kerberos_GSSAPI_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindLDAP.cmake b/cmake/cmake/modules/FindLDAP.cmake
@@ -44,7 +44,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_LDAP QUIET ldap)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_LDAP QUIET ldap)
+endif()
 
 find_path(
   LDAP_INCLUDE_DIR
@@ -65,7 +67,9 @@ find_library(
 )
 
 if(LDAP_LIBRARY)
-  pkg_check_modules(PC_LDAP_LBER QUIET lber)
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_LDAP_LBER QUIET lber)
+  endif()
 
   find_library(
     LDAP_LBER_LIBRARY

diff --git a/cmake/cmake/modules/FindLMDB.cmake b/cmake/cmake/modules/FindLMDB.cmake
@@ -37,7 +37,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_LMDB QUIET lmdb)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_LMDB QUIET lmdb)
+endif()
 
 find_path(
   LMDB_INCLUDE_DIR

diff --git a/cmake/cmake/modules/FindMySQL.cmake b/cmake/cmake/modules/FindMySQL.cmake
@@ -55,6 +55,7 @@ find_program(
   NAMES mysql_config
   DOC "The mysql_config command-line tool for getting MySQL installation info"
 )
+mark_as_advanced(MySQL_CONFIG_EXECUTABLE)
 
 # Find the Socket component.
 if("Socket" IN_LIST MySQL_FIND_COMPONENTS)
@@ -114,7 +115,9 @@ if("Lib" IN_LIST MySQL_FIND_COMPONENTS)
   else()
     # Use pkgconf, if available on the system.
     find_package(PkgConfig QUIET)
-    pkg_check_modules(PC_MySQL QUIET mysqlclient)
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(PC_MySQL QUIET mysqlclient)
+    endif()
   endif()
 
   find_path(

diff --git a/cmake/cmake/modules/FindNetSnmp.cmake b/cmake/cmake/modules/FindNetSnmp.cmake
@@ -38,7 +38,9 @@ set(_reason "")
 
 # Use pkgconf, if available on the system.
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_NetSnmp QUIET netsnmp)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_NetSnmp QUIET netsnmp)
+endif()
 
 find_program(
   NetSnmp_EXECUTABLE