romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-06 11:16:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

find step 4 requires rename

Browse source
This commit is contained in:
Viktor Szakats 2025-04-05 02:35:19 +02:00
parent 57a1b47f99
commit f120c50850
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
20 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMake/FindBrotli.cmake
View file

@ -35,14 +35,14 @@
# - `BROTLI_VERSION`: Version of brotli.
# - `CURL::brotli`: brotli library target.
set(BROTLI_PC_REQUIRES "libbrotlidec" "libbrotlicommon") # order is significant: brotlidec then brotlicommon
set(_brotli_pc_requires "libbrotlidec" "libbrotlicommon") # order is significant: brotlidec then brotlicommon
if(CURL_USE_PKGCONFIG AND
NOT DEFINED BROTLI_INCLUDE_DIR AND
NOT DEFINED BROTLICOMMON_LIBRARY AND
NOT DEFINED BROTLIDEC_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(BROTLI ${BROTLI_PC_REQUIRES})
pkg_check_modules(BROTLI ${_brotli_pc_requires})
endif()
if(BROTLI_FOUND)

4
CMake/FindCares.cmake
View file

@ -34,13 +34,13 @@
# - `CARES_VERSION`: Version of c-ares.
# - `CURL::cares`: c-ares library target.
set(CARES_PC_REQUIRES "libcares")
set(_cares_pc_requires "libcares")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED CARES_INCLUDE_DIR AND
NOT DEFINED CARES_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(CARES ${CARES_PC_REQUIRES})
pkg_check_modules(CARES ${_cares_pc_requires})
endif()
if(CARES_FOUND)

6
CMake/FindGSS.cmake
View file

@ -172,7 +172,7 @@ if(NOT _gss_FOUND) # Not found by pkg-config. Let us take more traditional appr
if(_gss_INCLUDE_DIRS)
set(GSS_FLAVOUR "GNU")
set(GSS_PC_REQUIRES ${_gnu_modname})
set(_gss_pc_requires ${_gnu_modname})
set(_gss_libname "gss")
endif()
endif()
@ -198,10 +198,10 @@ else()
# _pkg_check_modules_pkg_name is undocumented and used as a fallback for CMake <3.16 versions.
if(_gss_MODULE_NAME STREQUAL _gnu_modname OR _pkg_check_modules_pkg_name STREQUAL _gnu_modname)
set(GSS_FLAVOUR "GNU")
set(GSS_PC_REQUIRES ${_gnu_modname})
set(_gss_pc_requires ${_gnu_modname})
elseif(_gss_MODULE_NAME STREQUAL _mit_modname OR _pkg_check_modules_pkg_name STREQUAL _mit_modname)
set(GSS_FLAVOUR "MIT")
set(GSS_PC_REQUIRES ${_mit_modname})
set(_gss_pc_requires ${_mit_modname})
else()
message(FATAL_ERROR "GNU or MIT GSS is required")
endif()

6
CMake/FindLDAP.cmake
View file

@ -35,14 +35,14 @@
# - `LDAP_VERSION`: Version of ldap.
# - `CURL::ldap`: ldap library target.
set(LDAP_PC_REQUIRES "ldap" "lber")
set(_ldap_pc_requires "ldap" "lber")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED LDAP_INCLUDE_DIR AND
NOT DEFINED LDAP_LIBRARY AND
NOT DEFINED LDAP_LBER_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(LDAP ${LDAP_PC_REQUIRES})
pkg_check_modules(LDAP ${_ldap_pc_requires})
endif()
if(LDAP_FOUND)
@ -50,7 +50,7 @@ if(LDAP_FOUND)
string(REPLACE ";" " " LDAP_CFLAGS "${LDAP_CFLAGS}")
message(STATUS "Found LDAP (via pkg-config): ${LDAP_INCLUDE_DIRS} (found version \"${LDAP_VERSION}\")")
else()
set(LDAP_PC_REQUIRES "") # Depend on pkg-config only when found via pkg-config
set(_ldap_pc_requires "") # Depend on pkg-config only when found via pkg-config
# On Apple the SDK LDAP gets picked up from
# 'MacOSX.sdk/System/Library/Frameworks/LDAP.framework/Headers', which contains

4
CMake/FindLibgsasl.cmake
View file

@ -34,13 +34,13 @@
# - `LIBGSASL_VERSION`: Version of libgsasl.
# - `CURL::libgsasl`: libgsasl library target.
set(LIBGSASL_PC_REQUIRES "libgsasl")
set(_libgsasl_pc_requires "libgsasl")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED LIBGSASL_INCLUDE_DIR AND
NOT DEFINED LIBGSASL_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(LIBGSASL ${LIBGSASL_PC_REQUIRES})
pkg_check_modules(LIBGSASL ${_libgsasl_pc_requires})
endif()
if(LIBGSASL_FOUND)

4
CMake/FindLibidn2.cmake
View file

@ -34,13 +34,13 @@
# - `LIBIDN2_VERSION`: Version of libidn2.
# - `CURL::libidn2`: libidn2 library target.
set(LIBIDN2_PC_REQUIRES "libidn2")
set(_libidn2_pc_requires "libidn2")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED LIBIDN2_INCLUDE_DIR AND
NOT DEFINED LIBIDN2_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(LIBIDN2 ${LIBIDN2_PC_REQUIRES})
pkg_check_modules(LIBIDN2 ${_libidn2_pc_requires})
endif()
if(LIBIDN2_FOUND)

4
CMake/FindLibpsl.cmake
View file

@ -34,13 +34,13 @@
# - `LIBPSL_VERSION`: Version of libpsl.
# - `CURL::libpsl`: libpsl library target.
set(LIBPSL_PC_REQUIRES "libpsl")
set(_libpsl_pc_requires "libpsl")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED LIBPSL_INCLUDE_DIR AND
NOT DEFINED LIBPSL_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(LIBPSL ${LIBPSL_PC_REQUIRES})
pkg_check_modules(LIBPSL ${_libpsl_pc_requires})
endif()
if(LIBPSL_FOUND AND LIBPSL_INCLUDE_DIRS)

4
CMake/FindLibrtmp.cmake
View file

@ -34,13 +34,13 @@
# - `LIBRTMP_VERSION`: Version of librtmp.
# - `CURL::librtmp`: librtmp library target.
set(LIBRTMP_PC_REQUIRES "librtmp")
set(_librtmp_pc_requires "librtmp")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED LIBRTMP_INCLUDE_DIR AND
NOT DEFINED LIBRTMP_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(LIBRTMP ${LIBRTMP_PC_REQUIRES})
pkg_check_modules(LIBRTMP ${_librtmp_pc_requires})
endif()
if(LIBRTMP_FOUND AND LIBRTMP_INCLUDE_DIRS)

4
CMake/FindLibssh.cmake
View file

@ -34,13 +34,13 @@
# - `LIBSSH_VERSION`: Version of libssh.
# - `CURL::libssh`: libssh library target.
set(LIBSSH_PC_REQUIRES "libssh")
set(_libssh_pc_requires "libssh")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED LIBSSH_INCLUDE_DIR AND
NOT DEFINED LIBSSH_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(LIBSSH ${LIBSSH_PC_REQUIRES})
pkg_check_modules(LIBSSH ${_libssh_pc_requires})
endif()
if(LIBSSH_FOUND)

4
CMake/FindLibssh2.cmake
View file

@ -34,13 +34,13 @@
# - `LIBSSH2_VERSION`: Version of libssh2.
# - `CURL::libssh2`: libssh2 library target.
set(LIBSSH2_PC_REQUIRES "libssh2")
set(_libssh2_pc_requires "libssh2")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED LIBSSH2_INCLUDE_DIR AND
NOT DEFINED LIBSSH2_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(LIBSSH2 ${LIBSSH2_PC_REQUIRES})
pkg_check_modules(LIBSSH2 ${_libssh2_pc_requires})
endif()
if(LIBSSH2_FOUND AND LIBSSH2_INCLUDE_DIRS)

4
CMake/FindLibuv.cmake
View file

@ -34,13 +34,13 @@
# - `LIBUV_VERSION`: Version of libuv.
# - `CURL::libuv`: libuv library target.
set(LIBUV_PC_REQUIRES "libuv")
set(_libuv_pc_requires "libuv")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED LIBUV_INCLUDE_DIR AND
NOT DEFINED LIBUV_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(LIBUV ${LIBUV_PC_REQUIRES})
pkg_check_modules(LIBUV ${_libuv_pc_requires})
endif()
if(LIBUV_FOUND)

6
CMake/FindMbedTLS.cmake
View file

@ -42,7 +42,7 @@ if(DEFINED MBEDTLS_INCLUDE_DIRS AND NOT DEFINED MBEDTLS_INCLUDE_DIR)
unset(MBEDTLS_INCLUDE_DIRS)
endif()
set(MBEDTLS_PC_REQUIRES "mbedtls" "mbedx509" "mbedcrypto")
set(_mbedtls_pc_requires "mbedtls" "mbedx509" "mbedcrypto")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED MBEDTLS_INCLUDE_DIR AND
@ -50,7 +50,7 @@ if(CURL_USE_PKGCONFIG AND
NOT DEFINED MBEDX509_LIBRARY AND
NOT DEFINED MBEDCRYPTO_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(MBEDTLS ${MBEDTLS_PC_REQUIRES})
pkg_check_modules(MBEDTLS ${_mbedtls_pc_requires})
endif()
if(MBEDTLS_FOUND)
@ -59,7 +59,7 @@ if(MBEDTLS_FOUND)
string(REPLACE ";" " " MBEDTLS_CFLAGS "${MBEDTLS_CFLAGS}")
message(STATUS "Found MbedTLS (via pkg-config): ${MBEDTLS_INCLUDE_DIRS} (found version \"${MBEDTLS_VERSION}\")")
else()
set(MBEDTLS_PC_REQUIRES "") # Depend on pkg-config only when found via pkg-config
set(_mbedtls_pc_requires "") # Depend on pkg-config only when found via pkg-config
find_path(MBEDTLS_INCLUDE_DIR NAMES "mbedtls/ssl.h")
find_library(MBEDTLS_LIBRARY NAMES "mbedtls" "libmbedtls")

4
CMake/FindNGHTTP2.cmake
View file

@ -34,13 +34,13 @@
# - `NGHTTP2_VERSION`: Version of nghttp2.
# - `CURL::nghttp2`: nghttp2 library target.
set(NGHTTP2_PC_REQUIRES "libnghttp2")
set(_nghttp2_pc_requires "libnghttp2")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED NGHTTP2_INCLUDE_DIR AND
NOT DEFINED NGHTTP2_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(NGHTTP2 ${NGHTTP2_PC_REQUIRES})
pkg_check_modules(NGHTTP2 ${_nghttp2_pc_requires})
endif()
if(NGHTTP2_FOUND)

4
CMake/FindNGHTTP3.cmake
View file

@ -34,13 +34,13 @@
# - `NGHTTP3_VERSION`: Version of nghttp3.
# - `CURL::nghttp3`: nghttp3 library target.
set(NGHTTP3_PC_REQUIRES "libnghttp3")
set(_nghttp3_pc_requires "libnghttp3")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED NGHTTP3_INCLUDE_DIR AND
NOT DEFINED NGHTTP3_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(NGHTTP3 ${NGHTTP3_PC_REQUIRES})
pkg_check_modules(NGHTTP3 ${_nghttp3_pc_requires})
endif()
if(NGHTTP3_FOUND)

6
CMake/FindNGTCP2.cmake
View file

@ -67,9 +67,9 @@ if(NGTCP2_FIND_COMPONENTS)
endif()
endif()
set(NGTCP2_PC_REQUIRES "libngtcp2")
set(_ngtcp2_pc_requires "libngtcp2")
if(_ngtcp2_crypto_backend)
list(APPEND NGTCP2_PC_REQUIRES "lib${_crypto_library_lower}")
list(APPEND _ngtcp2_pc_requires "lib${_crypto_library_lower}")
endif()
set(_tried_pkgconfig FALSE)
@ -77,7 +77,7 @@ if(CURL_USE_PKGCONFIG AND
NOT DEFINED NGTCP2_INCLUDE_DIR AND
NOT DEFINED NGTCP2_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(NGTCP2 ${NGTCP2_PC_REQUIRES})
pkg_check_modules(NGTCP2 ${_ngtcp2_pc_requires})
set(_tried_pkgconfig TRUE)
endif()

4
CMake/FindNettle.cmake
View file

@ -34,13 +34,13 @@
# - `NETTLE_VERSION`: Version of nettle.
# - `CURL::nettle`: nettle library target.
set(NETTLE_PC_REQUIRES "nettle")
set(_nettle_pc_requires "nettle")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED NETTLE_INCLUDE_DIR AND
NOT DEFINED NETTLE_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(NETTLE ${NETTLE_PC_REQUIRES})
pkg_check_modules(NETTLE ${_nettle_pc_requires})
endif()
if(NETTLE_FOUND)

4
CMake/FindQuiche.cmake
View file

@ -34,13 +34,13 @@
# - `QUICHE_VERSION`: Version of quiche.
# - `CURL::quiche`: quiche library target.
set(QUICHE_PC_REQUIRES "quiche")
set(_quiche_pc_requires "quiche")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED QUICHE_INCLUDE_DIR AND
NOT DEFINED QUICHE_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(QUICHE ${QUICHE_PC_REQUIRES})
pkg_check_modules(QUICHE ${_quiche_pc_requires})
endif()
if(QUICHE_FOUND)

6
CMake/FindRustls.cmake
View file

@ -34,13 +34,13 @@
# - `RUSTLS_VERSION`: Version of Rustls.
# - `CURL::rustls`: Rustls library target.
set(RUSTLS_PC_REQUIRES "rustls")
set(_rustls_pc_requires "rustls")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED RUSTLS_INCLUDE_DIR AND
NOT DEFINED RUSTLS_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(RUSTLS ${RUSTLS_PC_REQUIRES})
pkg_check_modules(RUSTLS ${_rustls_pc_requires})
endif()
if(RUSTLS_FOUND)
@ -48,7 +48,7 @@ if(RUSTLS_FOUND)
string(REPLACE ";" " " RUSTLS_CFLAGS "${RUSTLS_CFLAGS}")
message(STATUS "Found Rustls (via pkg-config): ${RUSTLS_INCLUDE_DIRS} (found version \"${RUSTLS_VERSION}\")")
else()
set(RUSTLS_PC_REQUIRES "") # Depend on pkg-config only when found via pkg-config
set(_rustls_pc_requires "") # Depend on pkg-config only when found via pkg-config
find_path(RUSTLS_INCLUDE_DIR NAMES "rustls.h")
find_library(RUSTLS_LIBRARY NAMES "rustls")

4
CMake/FindWolfSSL.cmake
View file

@ -43,13 +43,13 @@ if(DEFINED WolfSSL_LIBRARY AND NOT DEFINED WOLFSSL_LIBRARY)
set(WOLFSSL_LIBRARY "${WolfSSL_LIBRARY}")
endif()
set(WOLFSSL_PC_REQUIRES "wolfssl")
set(_wolfssl_pc_requires "wolfssl")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED WOLFSSL_INCLUDE_DIR AND
NOT DEFINED WOLFSSL_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(WOLFSSL ${WOLFSSL_PC_REQUIRES})
pkg_check_modules(WOLFSSL ${_wolfssl_pc_requires})
endif()
if(WOLFSSL_FOUND)

4
CMake/FindZstd.cmake
View file

@ -43,13 +43,13 @@ if(DEFINED Zstd_LIBRARY AND NOT DEFINED ZSTD_LIBRARY)
set(ZSTD_LIBRARY "${Zstd_LIBRARY}")
endif()
set(ZSTD_PC_REQUIRES "libzstd")
set(_zstd_pc_requires "libzstd")
if(CURL_USE_PKGCONFIG AND
NOT DEFINED ZSTD_INCLUDE_DIR AND
NOT DEFINED ZSTD_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(ZSTD ${ZSTD_PC_REQUIRES})
pkg_check_modules(ZSTD ${_zstd_pc_requires})
endif()
if(ZSTD_FOUND)