romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:31:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

cmake: add CMake Config-based dependency detection for c-ares, wolfSSL

Browse source 
For wolfSSL it requires v5.2.1+, and with 5.9.0+ it's also supported when
wolfSSL was built with autotools.

Follow-up to 8fce3e17e6 #20814

Closes #21098
This commit is contained in:
Viktor Szakats 2026-03-25 20:05:32 +01:00
parent f660b77f74
commit a56ab9dbc8
No known key found for this signature in database
3 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
CMake/FindCares.cmake
View file

@ -37,11 +37,15 @@
set(_cares_pc_requires "libcares") set(_cares_pc_requires "libcares")
if(CURL_USE_PKGCONFIG AND if(NOT DEFINED CARES_INCLUDE_DIR AND
NOT DEFINED CARES_INCLUDE_DIR AND
NOT DEFINED CARES_LIBRARY) NOT DEFINED CARES_LIBRARY)
find_package(PkgConfig QUIET) if(CURL_USE_PKGCONFIG)
pkg_check_modules(_cares ${_cares_pc_requires}) find_package(PkgConfig QUIET)
pkg_check_modules(_cares ${_cares_pc_requires})
endif()
if(NOT _cares_FOUND AND CURL_USE_CMAKECONFIG)
find_package(c-ares CONFIG QUIET)
endif()
endif() endif()
if(_cares_FOUND) if(_cares_FOUND)
@ -55,6 +59,16 @@ if(_cares_FOUND)
set(_cares_LIBRARIES "${_cares_STATIC_LIBRARIES}") set(_cares_LIBRARIES "${_cares_STATIC_LIBRARIES}")
endif() endif()
message(STATUS "Found Cares (via pkg-config): ${_cares_INCLUDE_DIRS} (found version \"${CARES_VERSION}\")") message(STATUS "Found Cares (via pkg-config): ${_cares_INCLUDE_DIRS} (found version \"${CARES_VERSION}\")")
elseif(c-ares_CONFIG)
set(Cares_FOUND TRUE)
set(CARES_FOUND TRUE)
set(CARES_VERSION ${c-ares_VERSION})
if(CARES_USE_STATIC_LIBS)
set(_cares_LIBRARIES c-ares::cares_static)
else()
set(_cares_LIBRARIES c-ares::cares)
endif()
message(STATUS "Found Cares (via CMake Config): ${c-ares_CONFIG} (found version \"${CARES_VERSION}\")")
else() else()
find_path(CARES_INCLUDE_DIR NAMES "ares.h") find_path(CARES_INCLUDE_DIR NAMES "ares.h")
if(CARES_USE_STATIC_LIBS) if(CARES_USE_STATIC_LIBS)

18
CMake/FindWolfSSL.cmake
View file

@ -45,11 +45,15 @@ endif()
set(_wolfssl_pc_requires "wolfssl") set(_wolfssl_pc_requires "wolfssl")
if(CURL_USE_PKGCONFIG AND if(NOT DEFINED WOLFSSL_INCLUDE_DIR AND
NOT DEFINED WOLFSSL_INCLUDE_DIR AND
NOT DEFINED WOLFSSL_LIBRARY) NOT DEFINED WOLFSSL_LIBRARY)
find_package(PkgConfig QUIET) if(CURL_USE_PKGCONFIG)
pkg_check_modules(_wolfssl ${_wolfssl_pc_requires}) find_package(PkgConfig QUIET)
pkg_check_modules(_wolfssl ${_wolfssl_pc_requires})
endif()
if(NOT _wolfssl_FOUND AND CURL_USE_CMAKECONFIG)
find_package(wolfssl CONFIG QUIET)
endif()
endif() endif()
if(_wolfssl_FOUND) if(_wolfssl_FOUND)
@ -57,6 +61,12 @@ if(_wolfssl_FOUND)
set(WOLFSSL_FOUND TRUE) set(WOLFSSL_FOUND TRUE)
set(WOLFSSL_VERSION ${_wolfssl_VERSION}) set(WOLFSSL_VERSION ${_wolfssl_VERSION})
message(STATUS "Found WolfSSL (via pkg-config): ${_wolfssl_INCLUDE_DIRS} (found version \"${WOLFSSL_VERSION}\")") message(STATUS "Found WolfSSL (via pkg-config): ${_wolfssl_INCLUDE_DIRS} (found version \"${WOLFSSL_VERSION}\")")
elseif(wolfssl_CONFIG)
set(WolfSSL_FOUND TRUE)
set(WOLFSSL_FOUND TRUE)
set(WOLFSSL_VERSION ${wolfssl_VERSION})
set(_wolfssl_LIBRARIES wolfssl::wolfssl)
message(STATUS "Found WolfSSL (via CMake Config): ${wolfssl_CONFIG} (found version \"${WOLFSSL_VERSION}\")")
else() else()
find_path(WOLFSSL_INCLUDE_DIR NAMES "wolfssl/ssl.h") find_path(WOLFSSL_INCLUDE_DIR NAMES "wolfssl/ssl.h")
find_library(WOLFSSL_LIBRARY NAMES "wolfssl") find_library(WOLFSSL_LIBRARY NAMES "wolfssl")

6
docs/INSTALL-CMAKE.md
View file

@ -393,9 +393,9 @@ Details via CMake
- `<PackageName>_DIR`: Absolute path to `<PackageName>` CMake Config directory where `*.cmake` files reside. - `<PackageName>_DIR`: Absolute path to `<PackageName>` CMake Config directory where `*.cmake` files reside.
Used when `CURL_USE_CMAKECONFIG` is enabled. Used when `CURL_USE_CMAKECONFIG` is enabled.
`<PackageName>` may be: `<PackageName>` may be:
`Libssh2`, `MbedTLS`, `NGHTTP2`, `NGHTTP3`, `c-ares`, `Libssh2`, `MbedTLS`, `NGHTTP2`, `NGHTTP3`,
`NGTCP2` 1.19.0+ (with non-fork OpenSSL only), `NGTCP2` for 1.19.0+ (with non-fork OpenSSL only),
`Zstd` 1.4.5+. `wolfssl` for 5.2.1+, `Zstd` for 1.4.5+.
## Dependency options (tools) ## Dependency options (tools)