diff --git a/CMake/FindBrotli.cmake b/CMake/FindBrotli.cmake index a2afb3c315..50a30dd2ba 100644 --- a/CMake/FindBrotli.cmake +++ b/CMake/FindBrotli.cmake @@ -71,3 +71,20 @@ else() mark_as_advanced(BROTLI_INCLUDE_DIR BROTLIDEC_LIBRARY BROTLICOMMON_LIBRARY) endif() + +if(BROTLI_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl 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}") + endif() +endif() diff --git a/CMake/FindCares.cmake b/CMake/FindCares.cmake index 8d4bbfa49b..cfc7d0e60c 100644 --- a/CMake/FindCares.cmake +++ b/CMake/FindCares.cmake @@ -89,6 +89,23 @@ else() mark_as_advanced(CARES_INCLUDE_DIR CARES_LIBRARY) endif() -if(CARES_FOUND AND WIN32) - list(APPEND _cares_LIBRARIES "iphlpapi") # for if_indextoname and others +if(CARES_FOUND) + if(WIN32) + list(APPEND _cares_LIBRARIES "iphlpapi") # for if_indextoname and others + endif() + + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() endif() diff --git a/CMake/FindLDAP.cmake b/CMake/FindLDAP.cmake index 248c605f94..144a938ab6 100644 --- a/CMake/FindLDAP.cmake +++ b/CMake/FindLDAP.cmake @@ -102,3 +102,20 @@ else() mark_as_advanced(LDAP_INCLUDE_DIR LDAP_LIBRARY LDAP_LBER_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindLibgsasl.cmake b/CMake/FindLibgsasl.cmake index 11d2a326c7..fc4c1926af 100644 --- a/CMake/FindLibgsasl.cmake +++ b/CMake/FindLibgsasl.cmake @@ -78,3 +78,20 @@ else() mark_as_advanced(LIBGSASL_INCLUDE_DIR LIBGSASL_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindLibidn2.cmake b/CMake/FindLibidn2.cmake index 78b2b21946..06305715c8 100644 --- a/CMake/FindLibidn2.cmake +++ b/CMake/FindLibidn2.cmake @@ -78,3 +78,20 @@ else() mark_as_advanced(LIBIDN2_INCLUDE_DIR LIBIDN2_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindLibpsl.cmake b/CMake/FindLibpsl.cmake index b6db802c25..7e9938b5a7 100644 --- a/CMake/FindLibpsl.cmake +++ b/CMake/FindLibpsl.cmake @@ -78,3 +78,20 @@ else() mark_as_advanced(LIBPSL_INCLUDE_DIR LIBPSL_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindLibrtmp.cmake b/CMake/FindLibrtmp.cmake index 19ce5f0239..e2b1c51eb4 100644 --- a/CMake/FindLibrtmp.cmake +++ b/CMake/FindLibrtmp.cmake @@ -95,6 +95,23 @@ else() endif() endif() -if(LIBRTMP_FOUND AND WIN32) - list(APPEND _librtmp_LIBRARIES "winmm") +if(LIBRTMP_FOUND) + if(WIN32) + list(APPEND _librtmp_LIBRARIES "winmm") + endif() + + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() endif() diff --git a/CMake/FindLibssh.cmake b/CMake/FindLibssh.cmake index dc9d05e9cc..0b8790a728 100644 --- a/CMake/FindLibssh.cmake +++ b/CMake/FindLibssh.cmake @@ -89,6 +89,23 @@ else() mark_as_advanced(LIBSSH_INCLUDE_DIR LIBSSH_LIBRARY) endif() -if(LIBSSH_FOUND AND WIN32) - list(APPEND _libssh_LIBRARIES "iphlpapi") # for if_nametoindex +if(LIBSSH_FOUND) + if(WIN32) + list(APPEND _libssh_LIBRARIES "iphlpapi") # for if_nametoindex + endif() + + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() endif() diff --git a/CMake/FindLibssh2.cmake b/CMake/FindLibssh2.cmake index b8fb2f4333..d6318d362e 100644 --- a/CMake/FindLibssh2.cmake +++ b/CMake/FindLibssh2.cmake @@ -78,3 +78,20 @@ else() mark_as_advanced(LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindLibuv.cmake b/CMake/FindLibuv.cmake index 0f7f1e4b3e..40a2ad5337 100644 --- a/CMake/FindLibuv.cmake +++ b/CMake/FindLibuv.cmake @@ -88,3 +88,20 @@ else() mark_as_advanced(LIBUV_INCLUDE_DIR LIBUV_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindMbedTLS.cmake b/CMake/FindMbedTLS.cmake index eee7e4c103..ad35f17d58 100644 --- a/CMake/FindMbedTLS.cmake +++ b/CMake/FindMbedTLS.cmake @@ -95,3 +95,20 @@ else() mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindNGHTTP2.cmake b/CMake/FindNGHTTP2.cmake index e38a76466a..1ace64be13 100644 --- a/CMake/FindNGHTTP2.cmake +++ b/CMake/FindNGHTTP2.cmake @@ -77,3 +77,20 @@ else() mark_as_advanced(NGHTTP2_INCLUDE_DIR NGHTTP2_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindNGHTTP3.cmake b/CMake/FindNGHTTP3.cmake index 4c20be67e3..e9c937b02f 100644 --- a/CMake/FindNGHTTP3.cmake +++ b/CMake/FindNGHTTP3.cmake @@ -77,3 +77,20 @@ else() mark_as_advanced(NGHTTP3_INCLUDE_DIR NGHTTP3_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindNGTCP2.cmake b/CMake/FindNGTCP2.cmake index fc8369fecb..478df180fc 100644 --- a/CMake/FindNGTCP2.cmake +++ b/CMake/FindNGTCP2.cmake @@ -136,3 +136,20 @@ else() unset(NGTCP2_LIBRARY CACHE) endif() endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindNettle.cmake b/CMake/FindNettle.cmake index 33662b23fc..c3c96dcb86 100644 --- a/CMake/FindNettle.cmake +++ b/CMake/FindNettle.cmake @@ -83,3 +83,20 @@ else() mark_as_advanced(NETTLE_INCLUDE_DIR NETTLE_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindQuiche.cmake b/CMake/FindQuiche.cmake index f32861d724..d575e9c0ba 100644 --- a/CMake/FindQuiche.cmake +++ b/CMake/FindQuiche.cmake @@ -66,3 +66,20 @@ else() mark_as_advanced(QUICHE_INCLUDE_DIR QUICHE_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindRustls.cmake b/CMake/FindRustls.cmake index 9bfe6efd1d..2879e232bb 100644 --- a/CMake/FindRustls.cmake +++ b/CMake/FindRustls.cmake @@ -104,3 +104,20 @@ if(RUSTLS_FOUND) mark_as_advanced(MATH_LIBRARY) endif() endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif() diff --git a/CMake/FindWolfSSL.cmake b/CMake/FindWolfSSL.cmake index 7c89a2ff94..34d4e6fa16 100644 --- a/CMake/FindWolfSSL.cmake +++ b/CMake/FindWolfSSL.cmake @@ -110,4 +110,19 @@ if(WOLFSSL_FOUND) endif() mark_as_advanced(MATH_LIBRARY) endif() + + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() endif() diff --git a/CMake/FindZstd.cmake b/CMake/FindZstd.cmake index ec5a6cf0e5..85d9c0e269 100644 --- a/CMake/FindZstd.cmake +++ b/CMake/FindZstd.cmake @@ -97,3 +97,20 @@ else() mark_as_advanced(ZSTD_INCLUDE_DIR ZSTD_LIBRARY) endif() + +if(BEARSSL_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.13) + link_directories(${_bearssl_LIBRARY_DIRS}) + endif() + + if(NOT TARGET CURL::bearssl) + add_library(CURL::bearssl INTERFACE IMPORTED) + set_target_properties(CURL::bearssl PROPERTIES + VERSION "${BEARSSL_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}") + endif() +endif()