cmake: revert to `pkg_check_modules()`

Prefer `pkg_check_modules()` over `pkg_search_module()`.

`pkg_check_modules()` logs a line when there is a hit, and also warnings
if a sub-dependency is missing. In `QUIET` mode, both are silent.

The extra info is useful to see if a detection happened via
`pkg-config`.

Keep `pkg_search_module()` in `FindGSS`. We pass two dependencies
there and we want to keep stopping on the first one.

Partially reverts c2889a7b4180fc963ae30811f59ab547b6eb03cd #14388

Closes #14573

diff --git a/CMake/FindBrotli.cmake b/CMake/FindBrotli.cmake
index b328a08bb3c28a624e322d7b09d0ec27102604a3..d0fe01c6a0bb303e8c4c0294dff9936bb7c8cf13 100644 (file)
--- a/CMake/FindBrotli.cmake
+++ b/CMake/FindBrotli.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_BROTLI "libbrotlidec")
+  pkg_check_modules(PC_BROTLI "libbrotlidec")
 endif()
 
 find_path(BROTLI_INCLUDE_DIR "brotli/decode.h"

diff --git a/CMake/FindCARES.cmake b/CMake/FindCARES.cmake
index bbc942a2beb4dce87039a55b98def2aee5e227ab..6dd563dd280cdcb797f5af9910d1bc8e9cbc6c73 100644 (file)
--- a/CMake/FindCARES.cmake
+++ b/CMake/FindCARES.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_CARES "libcares")
+  pkg_check_modules(PC_CARES "libcares")
 endif()
 
 find_path(CARES_INCLUDE_DIR "ares.h"

diff --git a/CMake/FindLibPSL.cmake b/CMake/FindLibPSL.cmake
index 75268aa5cd92686ab50c562e12d25285fef07cec..57d38aac345bfd361a33822871838753e7163ee7 100644 (file)
--- a/CMake/FindLibPSL.cmake
+++ b/CMake/FindLibPSL.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_LIBPSL "libpsl")
+  pkg_check_modules(PC_LIBPSL "libpsl")
 endif()
 
 find_path(LIBPSL_INCLUDE_DIR "libpsl.h"

diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake
index 22e35ee3bc89e4fdf831b85ffaa78b277687af75..2d3b2c9fb15474c9150f3ab4b78e70e497de7f84 100644 (file)
--- a/CMake/FindLibSSH2.cmake
+++ b/CMake/FindLibSSH2.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_LIBSSH2 "libssh2")
+  pkg_check_modules(PC_LIBSSH2 "libssh2")
 endif()
 
 find_path(LIBSSH2_INCLUDE_DIR "libssh2.h"

diff --git a/CMake/FindMSH3.cmake b/CMake/FindMSH3.cmake
index 06b6c0020b7e6df1cb1215e9799e5d6f819d73b1..901119acc7f0a8b1997505effbe306122398d0f3 100644 (file)
--- a/CMake/FindMSH3.cmake
+++ b/CMake/FindMSH3.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_MSH3 "libmsh3")
+  pkg_check_modules(PC_MSH3 "libmsh3")
 endif()
 
 find_path(MSH3_INCLUDE_DIR "msh3.h"

diff --git a/CMake/FindMbedTLS.cmake b/CMake/FindMbedTLS.cmake
index b65885a674621dde49283055013daac4ed33f1f9..90d6a24d451e123c8684ce91f0ecc99d8a8810f0 100644 (file)
--- a/CMake/FindMbedTLS.cmake
+++ b/CMake/FindMbedTLS.cmake
@@ -38,7 +38,7 @@ endif()
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_MBEDTLS "mbedtls")
+  pkg_check_modules(PC_MBEDTLS "mbedtls")
 endif()
 
 find_path(MBEDTLS_INCLUDE_DIR "mbedtls/ssl.h"

diff --git a/CMake/FindNGHTTP2.cmake b/CMake/FindNGHTTP2.cmake
index b85b43f98a4fd51faab46d5ef44f5732613d9328..e41a5d1cd99f208645c468e13c29b91a5decc22e 100644 (file)
--- a/CMake/FindNGHTTP2.cmake
+++ b/CMake/FindNGHTTP2.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_NGHTTP2 "libnghttp2")
+  pkg_check_modules(PC_NGHTTP2 "libnghttp2")
 endif()
 
 find_path(NGHTTP2_INCLUDE_DIR "nghttp2/nghttp2.h"

diff --git a/CMake/FindNGHTTP3.cmake b/CMake/FindNGHTTP3.cmake
index b92936de985bdb148866c1ddf1488d377ff1f4f8..d0e34ab10cc8eb405e0ddab1f61404ae0946e9d8 100644 (file)
--- a/CMake/FindNGHTTP3.cmake
+++ b/CMake/FindNGHTTP3.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_NGHTTP3 "libnghttp3")
+  pkg_check_modules(PC_NGHTTP3 "libnghttp3")
 endif()
 
 find_path(NGHTTP3_INCLUDE_DIR "nghttp3/nghttp3.h"

diff --git a/CMake/FindNGTCP2.cmake b/CMake/FindNGTCP2.cmake
index 1f584841f7391bd07f67e36380f124c8ec3a1828..a51b1c2d3338578d9a0ae8f8f3d3e938cd7ebb74 100644 (file)
--- a/CMake/FindNGTCP2.cmake
+++ b/CMake/FindNGTCP2.cmake
@@ -40,7 +40,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_NGTCP2 "libngtcp2")
+  pkg_check_modules(PC_NGTCP2 "libngtcp2")
 endif()
 
 find_path(NGTCP2_INCLUDE_DIR "ngtcp2/ngtcp2.h"
@@ -80,7 +80,7 @@ if(NGTCP2_FIND_COMPONENTS)
   if(NGTCP2_CRYPTO_BACKEND)
     string(TOLOWER "ngtcp2_crypto_${NGTCP2_CRYPTO_BACKEND}" _crypto_library)
     if(CURL_USE_PKGCONFIG)
-      pkg_search_module(PC_${_crypto_library} "lib${_crypto_library}")
+      pkg_check_modules(PC_${_crypto_library} "lib${_crypto_library}")
     endif()
     find_library(${_crypto_library}_LIBRARY NAMES ${_crypto_library}
       HINTS

diff --git a/CMake/FindNettle.cmake b/CMake/FindNettle.cmake
index b3073367d26145516705017241838499f9101e68..e5e587a3d66f623f0a261991554026dda4558eaa 100644 (file)
--- a/CMake/FindNettle.cmake
+++ b/CMake/FindNettle.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(NETTLE "nettle")
+  pkg_check_modules(NETTLE "nettle")
 endif()
 
 if(NETTLE_FOUND)

diff --git a/CMake/FindQUICHE.cmake b/CMake/FindQUICHE.cmake
index b5660eeec33a37d630627e1076a354684e2e4a07..c2d08f9f7dae18caf7b876d47f65e4677c553fd8 100644 (file)
--- a/CMake/FindQUICHE.cmake
+++ b/CMake/FindQUICHE.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_QUICHE "quiche")
+  pkg_check_modules(PC_QUICHE "quiche")
 endif()
 
 find_path(QUICHE_INCLUDE_DIR "quiche.h"

diff --git a/CMake/FindWolfSSL.cmake b/CMake/FindWolfSSL.cmake
index 6e827b16aec3415171d29bffd411a591a75a8dfb..29d567adeca2ce1f808229b419c3e6c19b325754 100644 (file)
--- a/CMake/FindWolfSSL.cmake
+++ b/CMake/FindWolfSSL.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_WOLFSSL QUIET "wolfssl")
+  pkg_check_modules(PC_WOLFSSL QUIET "wolfssl")
 endif()
 
 find_path(WolfSSL_INCLUDE_DIR NAMES "wolfssl/ssl.h"

diff --git a/CMake/FindZstd.cmake b/CMake/FindZstd.cmake
index a2dfa3d6434edbfde1df26e17c250d430f890ea5..15a8a83164ff2f4e87591b640988d1d38cf09195 100644 (file)
--- a/CMake/FindZstd.cmake
+++ b/CMake/FindZstd.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_Zstd "libzstd")
+  pkg_check_modules(PC_Zstd "libzstd")
 endif()
 
 find_path(Zstd_INCLUDE_DIR "zstd.h"

diff --git a/CMake/Findrustls.cmake b/CMake/Findrustls.cmake
index 370d511b4a46b2293f781e38c97fdda78e6f6557..d45330c8d71851b7816e3abd865fb0946bc50fe9 100644 (file)
--- a/CMake/Findrustls.cmake
+++ b/CMake/Findrustls.cmake
@@ -32,7 +32,7 @@
 
 if(CURL_USE_PKGCONFIG)
   find_package(PkgConfig QUIET)
-  pkg_search_module(PC_RUSTLS "rustls")
+  pkg_check_modules(PC_RUSTLS "rustls")
 endif()
 
 find_path(RUSTLS_INCLUDE_DIR "rustls.h"

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44b0fe6fa8695be89f04fed39024b421b97f7ddf..ec91607965c79814b4b58f185c567bfd32777d42 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -605,7 +605,7 @@ endif()
 if(CURL_USE_GNUTLS)
   if(CURL_USE_PKGCONFIG)
     find_package(PkgConfig QUIET)
-    pkg_search_module(GNUTLS "gnutls")
+    pkg_check_modules(GNUTLS "gnutls")
     if(GNUTLS_FOUND)
       set(GNUTLS_LIBRARIES ${GNUTLS_LINK_LIBRARIES})
     endif()
@@ -1001,7 +1001,7 @@ if(USE_LIBIDN2)
   if(NOT HAVE_LIBIDN2 OR NOT HAVE_IDN2_H)
     if(CURL_USE_PKGCONFIG)
       find_package(PkgConfig QUIET)
-      pkg_search_module(LIBIDN2 "libidn2")
+      pkg_check_modules(LIBIDN2 "libidn2")
     endif()
     if(LIBIDN2_FOUND)
       include_directories(${LIBIDN2_INCLUDE_DIRS})
@@ -1082,7 +1082,7 @@ if(NOT USE_LIBSSH2 AND CURL_USE_LIBSSH)
     message(STATUS "Found libssh ${libssh_VERSION}")
   elseif(CURL_USE_PKGCONFIG)
     find_package(PkgConfig QUIET)
-    pkg_search_module(LIBSSH "libssh")
+    pkg_check_modules(LIBSSH "libssh")
     if(LIBSSH_FOUND)
       include_directories(${LIBSSH_INCLUDE_DIRS})
     endif()
@@ -1120,7 +1120,7 @@ mark_as_advanced(CURL_USE_GSASL)
 if(CURL_USE_GSASL)
   if(CURL_USE_PKGCONFIG)
     find_package(PkgConfig REQUIRED)
-    pkg_search_module(GSASL REQUIRED "libgsasl")
+    pkg_check_modules(GSASL REQUIRED "libgsasl")
   else()
     message(WARNING "GSASL has been requested but requires a platform with pkg-config support. Skipping.")
   endif()