From a66c669bb6ad5ba2dedd8e20402a48cbff1fb124 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 5 Apr 2025 03:27:14 +0200 Subject: [PATCH] find step 5 iface 3 --- CMake/FindBrotli.cmake | 18 +++++++++--------- CMake/FindCares.cmake | 18 +++++++++--------- CMake/FindLDAP.cmake | 18 +++++++++--------- CMake/FindLibgsasl.cmake | 18 +++++++++--------- CMake/FindLibidn2.cmake | 18 +++++++++--------- CMake/FindLibpsl.cmake | 18 +++++++++--------- CMake/FindLibrtmp.cmake | 18 +++++++++--------- CMake/FindLibssh.cmake | 18 +++++++++--------- CMake/FindLibssh2.cmake | 18 +++++++++--------- CMake/FindLibuv.cmake | 18 +++++++++--------- CMake/FindMbedTLS.cmake | 18 +++++++++--------- CMake/FindNGHTTP2.cmake | 18 +++++++++--------- CMake/FindNGHTTP3.cmake | 18 +++++++++--------- CMake/FindNGTCP2.cmake | 18 +++++++++--------- CMake/FindNettle.cmake | 18 +++++++++--------- CMake/FindQuiche.cmake | 18 +++++++++--------- CMake/FindRustls.cmake | 18 +++++++++--------- CMake/FindWolfSSL.cmake | 18 +++++++++--------- CMake/FindZstd.cmake | 18 +++++++++--------- 19 files changed, 171 insertions(+), 171 deletions(-) diff --git a/CMake/FindBrotli.cmake b/CMake/FindBrotli.cmake index 50a30dd2ba..0cc3243b2f 100644 --- a/CMake/FindBrotli.cmake +++ b/CMake/FindBrotli.cmake @@ -74,17 +74,17 @@ endif() if(BROTLI_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_brotli_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::brotli) + add_library(CURL::brotli INTERFACE IMPORTED) + set_target_properties(CURL::brotli PROPERTIES VERSION "${BROTLI_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_brotli_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_brotli_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_brotli_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_brotli_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_brotli_LIBRARIES}") endif() endif() diff --git a/CMake/FindCares.cmake b/CMake/FindCares.cmake index 6e1a723f2b..05219be280 100644 --- a/CMake/FindCares.cmake +++ b/CMake/FindCares.cmake @@ -95,17 +95,17 @@ if(CARES_FOUND) endif() if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_cares_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::cares) + add_library(CURL::cares INTERFACE IMPORTED) + set_target_properties(CURL::cares PROPERTIES VERSION "${CARES_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_cares_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_cares_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_cares_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_cares_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_cares_LIBRARIES}") endif() endif() diff --git a/CMake/FindLDAP.cmake b/CMake/FindLDAP.cmake index 56097d7170..1c1f256b41 100644 --- a/CMake/FindLDAP.cmake +++ b/CMake/FindLDAP.cmake @@ -105,17 +105,17 @@ endif() if(LDAP_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_ldap_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::ldap) + add_library(CURL::ldap INTERFACE IMPORTED) + set_target_properties(CURL::ldap PROPERTIES VERSION "${LDAP_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_ldap_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_ldap_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_ldap_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_ldap_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_ldap_LIBRARIES}") endif() endif() diff --git a/CMake/FindLibgsasl.cmake b/CMake/FindLibgsasl.cmake index b6536bf111..62f036d17b 100644 --- a/CMake/FindLibgsasl.cmake +++ b/CMake/FindLibgsasl.cmake @@ -81,17 +81,17 @@ endif() if(LIBGSASL_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_libgsasl_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::libgsasl) + add_library(CURL::libgsasl INTERFACE IMPORTED) + set_target_properties(CURL::libgsasl PROPERTIES VERSION "${LIBGSASL_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_libgsasl_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_libgsasl_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_libgsasl_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_libgsasl_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_libgsasl_LIBRARIES}") endif() endif() diff --git a/CMake/FindLibidn2.cmake b/CMake/FindLibidn2.cmake index a0e9a9e1ad..0e20f938a5 100644 --- a/CMake/FindLibidn2.cmake +++ b/CMake/FindLibidn2.cmake @@ -81,17 +81,17 @@ endif() if(LIBIDN2_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_libidn2_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::libidn2) + add_library(CURL::libidn2 INTERFACE IMPORTED) + set_target_properties(CURL::libidn2 PROPERTIES VERSION "${LIBIDN2_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_libidn2_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_libidn2_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_libidn2_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_libidn2_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_libidn2_LIBRARIES}") endif() endif() diff --git a/CMake/FindLibpsl.cmake b/CMake/FindLibpsl.cmake index 95830b40a6..d9906113d6 100644 --- a/CMake/FindLibpsl.cmake +++ b/CMake/FindLibpsl.cmake @@ -81,17 +81,17 @@ endif() if(LIBPSL_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_libpsl_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::libpsl) + add_library(CURL::libpsl INTERFACE IMPORTED) + set_target_properties(CURL::libpsl PROPERTIES VERSION "${LIBPSL_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_libpsl_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_libpsl_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_libpsl_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_libpsl_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_libpsl_LIBRARIES}") endif() endif() diff --git a/CMake/FindLibrtmp.cmake b/CMake/FindLibrtmp.cmake index c7f1f3d012..a9cc3038e3 100644 --- a/CMake/FindLibrtmp.cmake +++ b/CMake/FindLibrtmp.cmake @@ -101,17 +101,17 @@ if(LIBRTMP_FOUND) endif() if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_librtmp_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::librtmp) + add_library(CURL::librtmp INTERFACE IMPORTED) + set_target_properties(CURL::librtmp PROPERTIES VERSION "${LIBRTMP_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_librtmp_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_librtmp_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_librtmp_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_librtmp_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_librtmp_LIBRARIES}") endif() endif() diff --git a/CMake/FindLibssh.cmake b/CMake/FindLibssh.cmake index 216e3de94e..43a0c41d28 100644 --- a/CMake/FindLibssh.cmake +++ b/CMake/FindLibssh.cmake @@ -95,17 +95,17 @@ if(LIBSSH_FOUND) endif() if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_libssh_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::libssh) + add_library(CURL::libssh INTERFACE IMPORTED) + set_target_properties(CURL::libssh PROPERTIES VERSION "${LIBSSH_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_libssh_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_libssh_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_libssh_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_libssh_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_libssh_LIBRARIES}") endif() endif() diff --git a/CMake/FindLibssh2.cmake b/CMake/FindLibssh2.cmake index 93147b4ef9..82c193477c 100644 --- a/CMake/FindLibssh2.cmake +++ b/CMake/FindLibssh2.cmake @@ -81,17 +81,17 @@ endif() if(LIBSSH2_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_libssh2_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::libssh2) + add_library(CURL::libssh2 INTERFACE IMPORTED) + set_target_properties(CURL::libssh2 PROPERTIES VERSION "${LIBSSH2_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_libssh2_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_libssh2_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_libssh2_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_libssh2_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_libssh2_LIBRARIES}") endif() endif() diff --git a/CMake/FindLibuv.cmake b/CMake/FindLibuv.cmake index 17db9439d6..59eaba8199 100644 --- a/CMake/FindLibuv.cmake +++ b/CMake/FindLibuv.cmake @@ -91,17 +91,17 @@ endif() if(LIBUV_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_libuv_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::libuv) + add_library(CURL::libuv INTERFACE IMPORTED) + set_target_properties(CURL::libuv PROPERTIES VERSION "${LIBUV_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_libuv_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_libuv_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_libuv_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_libuv_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_libuv_LIBRARIES}") endif() endif() diff --git a/CMake/FindMbedTLS.cmake b/CMake/FindMbedTLS.cmake index ca6659d178..1cb3fb7a9c 100644 --- a/CMake/FindMbedTLS.cmake +++ b/CMake/FindMbedTLS.cmake @@ -98,17 +98,17 @@ endif() if(MBEDTLS_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_mbedtls_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::mbedtls) + add_library(CURL::mbedtls INTERFACE IMPORTED) + set_target_properties(CURL::mbedtls PROPERTIES VERSION "${MBEDTLS_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_mbedtls_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_mbedtls_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_mbedtls_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_mbedtls_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_mbedtls_LIBRARIES}") endif() endif() diff --git a/CMake/FindNGHTTP2.cmake b/CMake/FindNGHTTP2.cmake index 05c29f731e..9c4520d26f 100644 --- a/CMake/FindNGHTTP2.cmake +++ b/CMake/FindNGHTTP2.cmake @@ -80,17 +80,17 @@ endif() if(NGHTTP2_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_nghttp2_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::nghttp2) + add_library(CURL::nghttp2 INTERFACE IMPORTED) + set_target_properties(CURL::nghttp2 PROPERTIES VERSION "${NGHTTP2_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_nghttp2_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_nghttp2_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_nghttp2_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_nghttp2_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_nghttp2_LIBRARIES}") endif() endif() diff --git a/CMake/FindNGHTTP3.cmake b/CMake/FindNGHTTP3.cmake index 77710b5e38..499c799102 100644 --- a/CMake/FindNGHTTP3.cmake +++ b/CMake/FindNGHTTP3.cmake @@ -80,17 +80,17 @@ endif() if(NGHTTP3_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_nghttp3_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::nghttp3) + add_library(CURL::nghttp3 INTERFACE IMPORTED) + set_target_properties(CURL::nghttp3 PROPERTIES VERSION "${NGHTTP3_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_nghttp3_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_nghttp3_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_nghttp3_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_nghttp3_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_nghttp3_LIBRARIES}") endif() endif() diff --git a/CMake/FindNGTCP2.cmake b/CMake/FindNGTCP2.cmake index e910716e3d..ebfbd45e71 100644 --- a/CMake/FindNGTCP2.cmake +++ b/CMake/FindNGTCP2.cmake @@ -139,17 +139,17 @@ endif() if(NGTCP2_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_ngtcp2_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::ngtcp2) + add_library(CURL::ngtcp2 INTERFACE IMPORTED) + set_target_properties(CURL::ngtcp2 PROPERTIES VERSION "${NGTCP2_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_ngtcp2_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_ngtcp2_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_ngtcp2_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_ngtcp2_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_ngtcp2_LIBRARIES}") endif() endif() diff --git a/CMake/FindNettle.cmake b/CMake/FindNettle.cmake index fef13a3deb..d84601b78e 100644 --- a/CMake/FindNettle.cmake +++ b/CMake/FindNettle.cmake @@ -86,17 +86,17 @@ endif() if(NETTLE_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_nettle_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::nettle) + add_library(CURL::nettle INTERFACE IMPORTED) + set_target_properties(CURL::nettle PROPERTIES VERSION "${NETTLE_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_nettle_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_nettle_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_nettle_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_nettle_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_nettle_LIBRARIES}") endif() endif() diff --git a/CMake/FindQuiche.cmake b/CMake/FindQuiche.cmake index 8b2cb6b663..f30f24ca7a 100644 --- a/CMake/FindQuiche.cmake +++ b/CMake/FindQuiche.cmake @@ -69,17 +69,17 @@ endif() if(QUICHE_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_quiche_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::quiche) + add_library(CURL::quiche INTERFACE IMPORTED) + set_target_properties(CURL::quiche PROPERTIES VERSION "${QUICHE_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_quiche_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_quiche_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_quiche_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_quiche_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_quiche_LIBRARIES}") endif() endif() diff --git a/CMake/FindRustls.cmake b/CMake/FindRustls.cmake index 6716827003..73944a52c0 100644 --- a/CMake/FindRustls.cmake +++ b/CMake/FindRustls.cmake @@ -107,17 +107,17 @@ endif() if(RUSTLS_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_rustls_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::rustls) + add_library(CURL::rustls INTERFACE IMPORTED) + set_target_properties(CURL::rustls PROPERTIES VERSION "${RUSTLS_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_rustls_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_rustls_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_rustls_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_rustls_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_rustls_LIBRARIES}") endif() endif() diff --git a/CMake/FindWolfSSL.cmake b/CMake/FindWolfSSL.cmake index 8c50532c4c..ce3091aa67 100644 --- a/CMake/FindWolfSSL.cmake +++ b/CMake/FindWolfSSL.cmake @@ -112,17 +112,17 @@ if(WOLFSSL_FOUND) endif() if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_wolfssl_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::wolfssl) + add_library(CURL::wolfssl INTERFACE IMPORTED) + set_target_properties(CURL::wolfssl PROPERTIES VERSION "${WOLFSSL_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_wolfssl_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_wolfssl_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_wolfssl_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_wolfssl_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_wolfssl_LIBRARIES}") endif() endif() diff --git a/CMake/FindZstd.cmake b/CMake/FindZstd.cmake index 01ee52df1c..1721450fd6 100644 --- a/CMake/FindZstd.cmake +++ b/CMake/FindZstd.cmake @@ -100,17 +100,17 @@ endif() if(ZSTD_FOUND) if(CMAKE_VERSION VERSION_LESS 3.13) - link_directories(${_bearssl_LIBRARY_DIRS}) + link_directories(${_zstd_LIBRARY_DIRS}) endif() - if(NOT TARGET CURL::bearssl) - add_library(CURL::bearssl INTERFACE IMPORTED) - set_target_properties(CURL::bearssl PROPERTIES + if(NOT TARGET CURL::zstd) + add_library(CURL::zstd INTERFACE IMPORTED) + set_target_properties(CURL::zstd PROPERTIES VERSION "${ZSTD_VERSION}" - CURL_PC_MODULES "${_bearssl_pc_requires}" - INTERFACE_COMPILE_OPTIONS "${_bearssl_CFLAGS}" - INTERFACE_INCLUDE_DIRECTORIES "${_bearssl_INCLUDE_DIRS}" - INTERFACE_LINK_DIRECTORIES "${_bearssl_LIBRARY_DIRS}" - INTERFACE_LINK_LIBRARIES "${_bearssl_LIBRARIES}") + CURL_PC_MODULES "${_zstd_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_zstd_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_zstd_INCLUDE_DIRS}" + INTERFACE_LINK_DIRECTORIES "${_zstd_LIBRARY_DIRS}" + INTERFACE_LINK_LIBRARIES "${_zstd_LIBRARIES}") endif() endif()