cmake/Find: set `<Modulename>_FOUND` for compatibility when found via `pkg-config`

For Find modules where `<Modulename>` is not fully uppercase.

`<Modulename>` is case-exact name used in the Find modules filename:
`CMake/Find<Moduleame>.cmake`.

`find_package_handle_standard_args()` sets both `<MODULENAME>_FOUND` and
`<Modulename>_FOUND` when detecting the dependency. Some CMake code
relies on this and 3rd-party code may rely on it too. Make sure to set
the latter variant when detecting the dependency via `pkg-config`, where
we don't call `find_package_handle_standard_args()`.

CMake sets these variable to `TRUE` (not `ON` or `1`). Replicate this
for compatibility.

Closes #16153

diff --git a/CMake/FindBrotli.cmake b/CMake/FindBrotli.cmake
index 8a692bda105fb26bf16a827217ac228bd974d209..b72f1906fff70c8b297ef1e63d3f0023be7b3b92 100644 (file)
--- a/CMake/FindBrotli.cmake
+++ b/CMake/FindBrotli.cmake
@@ -51,6 +51,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(BROTLI_FOUND AND BROTLIDEC_FOUND)
+  set(Brotli_FOUND TRUE)
   list(APPEND BROTLIDEC_LIBRARIES ${BROTLI_LIBRARIES})  # order is significant: brotlidec then brotlicommon
   list(REVERSE BROTLIDEC_LIBRARIES)
   list(REMOVE_DUPLICATES BROTLIDEC_LIBRARIES)

diff --git a/CMake/FindCares.cmake b/CMake/FindCares.cmake
index 67dec09465638f4646d3ad80019975499ea0bd97..cc47e2d3310368dda3d1fed225a0f8571040a070 100644 (file)
--- a/CMake/FindCares.cmake
+++ b/CMake/FindCares.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(CARES_FOUND)
+  set(Cares_FOUND TRUE)
   string(REPLACE ";" " " CARES_CFLAGS "${CARES_CFLAGS}")
   message(STATUS "Found Cares (via pkg-config): ${CARES_INCLUDE_DIRS} (found version \"${CARES_VERSION}\")")
 else()

diff --git a/CMake/FindLibgsasl.cmake b/CMake/FindLibgsasl.cmake
index c0ce67393fbcc75b7a4931de2d919307661e5213..c726ce1a49d368a594de58524c4867df36398ad5 100644 (file)
--- a/CMake/FindLibgsasl.cmake
+++ b/CMake/FindLibgsasl.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(LIBGSASL_FOUND)
+  set(Libgsasl_FOUND TRUE)
   string(REPLACE ";" " " LIBGSASL_CFLAGS "${LIBGSASL_CFLAGS}")
   message(STATUS "Found Libgsasl (via pkg-config): ${LIBGSASL_INCLUDE_DIRS} (found version \"${LIBGSASL_VERSION}\")")
 else()

diff --git a/CMake/FindLibidn2.cmake b/CMake/FindLibidn2.cmake
index a8887e8954f86fc479b8b75fddb3e3d166515781..f8f00f0c7913bc20ec51bb307d829b4f9adb31c9 100644 (file)
--- a/CMake/FindLibidn2.cmake
+++ b/CMake/FindLibidn2.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(LIBIDN2_FOUND)
+  set(Libidn2_FOUND TRUE)
   string(REPLACE ";" " " LIBIDN2_CFLAGS "${LIBIDN2_CFLAGS}")
   message(STATUS "Found Libidn2 (via pkg-config): ${LIBIDN2_INCLUDE_DIRS} (found version \"${LIBIDN2_VERSION}\")")
 else()

diff --git a/CMake/FindLibpsl.cmake b/CMake/FindLibpsl.cmake
index 0d969951794fd8aec2710580c468ac59bef5c464..d6fde4b2d03cd85c1b8876995a004ea0d5017827 100644 (file)
--- a/CMake/FindLibpsl.cmake
+++ b/CMake/FindLibpsl.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(LIBPSL_FOUND AND LIBPSL_INCLUDE_DIRS)
+  set(Libpsl_FOUND TRUE)
   string(REPLACE ";" " " LIBPSL_CFLAGS "${LIBPSL_CFLAGS}")
   message(STATUS "Found Libpsl (via pkg-config): ${LIBPSL_INCLUDE_DIRS} (found version \"${LIBPSL_VERSION}\")")
 else()

diff --git a/CMake/FindLibrtmp.cmake b/CMake/FindLibrtmp.cmake
index dd3fb9e010342065f567f1a6dea780a71298941a..50fc9692bd2432ba53c1d399bc4a788b55bf0d7e 100644 (file)
--- a/CMake/FindLibrtmp.cmake
+++ b/CMake/FindLibrtmp.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(LIBRTMP_FOUND AND LIBRTMP_INCLUDE_DIRS)
+  set(Librtmp_FOUND TRUE)
   string(REPLACE ";" " " LIBRTMP_CFLAGS "${LIBRTMP_CFLAGS}")
   message(STATUS "Found Librtmp (via pkg-config): ${LIBRTMP_INCLUDE_DIRS} (found version \"${LIBRTMP_VERSION}\")")
 else()

diff --git a/CMake/FindLibssh.cmake b/CMake/FindLibssh.cmake
index b8b4a51a4a0db8f133dabfbfef264f1295989d55..e2b27d975c3b2f857c16a0d498c7df36431ace8f 100644 (file)
--- a/CMake/FindLibssh.cmake
+++ b/CMake/FindLibssh.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(LIBSSH_FOUND)
+  set(Libssh_FOUND TRUE)
   string(REPLACE ";" " " LIBSSH_CFLAGS "${LIBSSH_CFLAGS}")
   message(STATUS "Found Libssh (via pkg-config): ${LIBSSH_INCLUDE_DIRS} (found version \"${LIBSSH_VERSION}\")")
 else()

diff --git a/CMake/FindLibssh2.cmake b/CMake/FindLibssh2.cmake
index dfb0582a8be96a1f24092469ba14918a2ff7a63e..0b81ecb3cfcbd6c84bc93c30b58fe4c3f2550205 100644 (file)
--- a/CMake/FindLibssh2.cmake
+++ b/CMake/FindLibssh2.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(LIBSSH2_FOUND AND LIBSSH2_INCLUDE_DIRS)
+  set(Libssh2_FOUND TRUE)
   string(REPLACE ";" " " LIBSSH2_CFLAGS "${LIBSSH2_CFLAGS}")
   message(STATUS "Found Libssh2 (via pkg-config): ${LIBSSH2_INCLUDE_DIRS} (found version \"${LIBSSH2_VERSION}\")")
 else()

diff --git a/CMake/FindLibuv.cmake b/CMake/FindLibuv.cmake
index 8255eaa1356969fd0af2cda000c641aacd18acfd..b16b3554f6510b0d0d2c6ebb8283312a36c934d9 100644 (file)
--- a/CMake/FindLibuv.cmake
+++ b/CMake/FindLibuv.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(LIBUV_FOUND)
+  set(Libuv_FOUND TRUE)
   string(REPLACE ";" " " LIBUV_CFLAGS "${LIBUV_CFLAGS}")
   message(STATUS "Found Libuv (via pkg-config): ${LIBUV_INCLUDE_DIRS} (found version \"${LIBUV_VERSION}\")")
 else()

diff --git a/CMake/FindMbedTLS.cmake b/CMake/FindMbedTLS.cmake
index c3ba27d8a7e67bad8e8dacadd4340eb76a051a63..83f13712e41ff6e1f59504046f00656f61c0f095 100644 (file)
--- a/CMake/FindMbedTLS.cmake
+++ b/CMake/FindMbedTLS.cmake
@@ -60,6 +60,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(MBEDTLS_FOUND AND MBEDX509_FOUND AND MBEDCRYPTO_FOUND)
+  set(MbedTLS_FOUND TRUE)
   list(APPEND MBEDTLS_LIBRARIES ${MBEDX509_LIBRARIES} ${MBEDCRYPTO_LIBRARIES})
   list(REVERSE MBEDTLS_LIBRARIES)
   list(REMOVE_DUPLICATES MBEDTLS_LIBRARIES)

diff --git a/CMake/FindNettle.cmake b/CMake/FindNettle.cmake
index 753633a23e4c3708adf8bed8824948ccf1a4b8a1..c2decf6e7b08da228fd3a2b32be0c6654e702718 100644 (file)
--- a/CMake/FindNettle.cmake
+++ b/CMake/FindNettle.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(NETTLE_FOUND)
+  set(Nettle_FOUND TRUE)
   string(REPLACE ";" " " NETTLE_CFLAGS "${NETTLE_CFLAGS}")
   message(STATUS "Found Nettle (via pkg-config): ${NETTLE_INCLUDE_DIRS} (found version \"${NETTLE_VERSION}\")")
 else()

diff --git a/CMake/FindQuiche.cmake b/CMake/FindQuiche.cmake
index 092aff89e50bf2c491ab24f04604937c313c1ee5..6939c64e0ff9bf37173990810ed390a156f822c5 100644 (file)
--- a/CMake/FindQuiche.cmake
+++ b/CMake/FindQuiche.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(QUICHE_FOUND)
+  set(Quiche_FOUND TRUE)
   string(REPLACE ";" " " QUICHE_CFLAGS "${QUICHE_CFLAGS}")
   message(STATUS "Found Quiche (via pkg-config): ${QUICHE_INCLUDE_DIRS} (found version \"${QUICHE_VERSION}\")")
 else()

diff --git a/CMake/FindRustls.cmake b/CMake/FindRustls.cmake
index 51f45060b7174085269b783a69b07cbe9ca8af16..564b08ce15bc22f42eaeef3be51c0847bdf01b72 100644 (file)
--- a/CMake/FindRustls.cmake
+++ b/CMake/FindRustls.cmake
@@ -48,6 +48,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(RUSTLS_FOUND)
+  set(Rustls_FOUND TRUE)
   string(REPLACE ";" " " RUSTLS_CFLAGS "${RUSTLS_CFLAGS}")
   message(STATUS "Found Rustls (via pkg-config): ${RUSTLS_INCLUDE_DIRS} (found version \"${RUSTLS_VERSION}\")")
 else()

diff --git a/CMake/FindWolfSSL.cmake b/CMake/FindWolfSSL.cmake
index 3163fee9b9644e060884f28d29a45036d692c0e7..e33fef8711990548418eee0b6d911e8dface4aa2 100644 (file)
--- a/CMake/FindWolfSSL.cmake
+++ b/CMake/FindWolfSSL.cmake
@@ -57,6 +57,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(WOLFSSL_FOUND)
+  set(WolfSSL_FOUND TRUE)
   string(REPLACE ";" " " WOLFSSL_CFLAGS "${WOLFSSL_CFLAGS}")
   message(STATUS "Found WolfSSL (via pkg-config): ${WOLFSSL_INCLUDE_DIRS} (found version \"${WOLFSSL_VERSION}\")")
 else()

diff --git a/CMake/FindZstd.cmake b/CMake/FindZstd.cmake
index dbfede708bdbf6426c8de79c9b966a5a8a320c59..0ea1fef46724a552a07791da0d23b404615a005e 100644 (file)
--- a/CMake/FindZstd.cmake
+++ b/CMake/FindZstd.cmake
@@ -57,6 +57,7 @@ if(CURL_USE_PKGCONFIG AND
 endif()
 
 if(ZSTD_FOUND)
+  set(Zstd_FOUND TRUE)
   string(REPLACE ";" " " ZSTD_CFLAGS "${ZSTD_CFLAGS}")
   message(STATUS "Found Zstd (via pkg-config): ${ZSTD_INCLUDE_DIRS} (found version \"${ZSTD_VERSION}\")")
 else()