curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-12 23:22:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

cmake: tidy up around ngtcp2 and wolfSSL

Browse Source 
- fix to add the `m` library without path.
  Follow-up to 8577f4ca08 #14343
  Authored-by: Tal Regev
  Fixes #14549

- move `m` library detection to wolfSSL Find module.
  `m` is necessary for wolfSSL (wolfcrypt) library functions called by
  `libngtcp2_crypto_wolfssl`.
  Follow-up to 8577f4ca08 #14343

- fix comment header about supported `COMPONENT` names.

- quote strings.

- lowercase local variables.

Closes #14576
This commit is contained in:
Viktor Szakats 2024-08-17 01:41:23 +02:00
parent 24889acbfb
commit 1d29246534
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMake/FindNGTCP2.cmake
View File

@ -26,8 +26,8 @@
# This module accepts optional COMPONENTS to control the crypto library (these are # This module accepts optional COMPONENTS to control the crypto library (these are
# mutually exclusive): # mutually exclusive):
# #
# quictls, LibreSSL: Use libngtcp2_crypto_quictls # quictls: Use libngtcp2_crypto_quictls (choose this for LibreSSL)
# BoringSSL, AWS-LC: Use libngtcp2_crypto_boringssl # BoringSSL: Use libngtcp2_crypto_boringssl (choose this for AWS-LC)
# wolfSSL: Use libngtcp2_crypto_wolfssl # wolfSSL: Use libngtcp2_crypto_wolfssl
# GnuTLS: Use libngtcp2_crypto_gnutls # GnuTLS: Use libngtcp2_crypto_gnutls
# #

7
CMake/FindWolfSSL.cmake
View File

@ -79,6 +79,13 @@ find_package_handle_standard_args(WolfSSL
if(WOLFSSL_FOUND) if(WOLFSSL_FOUND)
set(WOLFSSL_INCLUDE_DIRS ${WOLFSSL_INCLUDE_DIR}) set(WOLFSSL_INCLUDE_DIRS ${WOLFSSL_INCLUDE_DIR})
set(WOLFSSL_LIBRARIES ${WOLFSSL_LIBRARY}) set(WOLFSSL_LIBRARIES ${WOLFSSL_LIBRARY})
if(NOT WIN32)
find_library(_math_library "m")
if(_math_library)
list(APPEND WOLFSSL_LIBRARIES "m") # for log and pow
endif()
endif()
endif() endif()
mark_as_advanced(WOLFSSL_INCLUDE_DIR WOLFSSL_LIBRARY) mark_as_advanced(WOLFSSL_INCLUDE_DIR WOLFSSL_LIBRARY)

13
CMakeLists.txt
View File

@ -796,28 +796,25 @@ option(USE_NGTCP2 "Use ngtcp2 and nghttp3 libraries for HTTP/3 support" OFF)
if(USE_NGTCP2) if(USE_NGTCP2)
if(USE_OPENSSL OR USE_WOLFSSL) if(USE_OPENSSL OR USE_WOLFSSL)
if(USE_WOLFSSL) if(USE_WOLFSSL)
find_package(NGTCP2 REQUIRED wolfSSL) find_package(NGTCP2 REQUIRED "wolfSSL")
if(NOT WIN32)
find_library(MATH_LIBRARY m)
endif()
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2_crypto_wolfssl") list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2_crypto_wolfssl")
elseif(HAVE_BORINGSSL OR HAVE_AWSLC) elseif(HAVE_BORINGSSL OR HAVE_AWSLC)
find_package(NGTCP2 REQUIRED BoringSSL) find_package(NGTCP2 REQUIRED "BoringSSL")
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2_crypto_boringssl") list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2_crypto_boringssl")
else() else()
find_package(NGTCP2 REQUIRED quictls) find_package(NGTCP2 REQUIRED "quictls")
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2_crypto_quictls") list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2_crypto_quictls")
endif() endif()
openssl_check_quic() openssl_check_quic()
elseif(USE_GNUTLS) elseif(USE_GNUTLS)
find_package(NGTCP2 REQUIRED GnuTLS) find_package(NGTCP2 REQUIRED "GnuTLS")
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2_crypto_gnutls") list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2_crypto_gnutls")
else() else()
message(FATAL_ERROR "ngtcp2 requires OpenSSL, wolfSSL or GnuTLS") message(FATAL_ERROR "ngtcp2 requires OpenSSL, wolfSSL or GnuTLS")
endif() endif()
set(USE_NGTCP2 ON) set(USE_NGTCP2 ON)
include_directories(${NGTCP2_INCLUDE_DIRS}) include_directories(${NGTCP2_INCLUDE_DIRS})
list(APPEND CURL_LIBS ${NGTCP2_LIBRARIES} ${MATH_LIBRARY}) list(APPEND CURL_LIBS ${NGTCP2_LIBRARIES})
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2") list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2")
find_package(NGHTTP3 REQUIRED) find_package(NGHTTP3 REQUIRED)