romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-27 08:12:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

cmake/FindNGTCP2: simplify multi-pkg-config detection

Browse source 
Use a single `pkg_check_modules` call to detect the main & crypto libs.

Follow-up to 3b501976a9 #16479
Closes #16980
This commit is contained in:
Viktor Szakats 2025-04-05 20:09:50 +02:00
parent badfb951ec
commit 01e45f81bd
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CMake/FindNGTCP2.cmake
View file

@ -65,7 +65,7 @@ endif()
set(NGTCP2_PC_REQUIRES "libngtcp2")
if(_ngtcp2_crypto_backend)
set(NGTCP2_CRYPTO_PC_REQUIRES "lib${_crypto_library_lower}")
list(APPEND NGTCP2_PC_REQUIRES "lib${_crypto_library_lower}")
endif()
if(CURL_USE_PKGCONFIG AND
@ -73,18 +73,9 @@ if(CURL_USE_PKGCONFIG AND
NOT DEFINED NGTCP2_LIBRARY)
find_package(PkgConfig QUIET)
pkg_check_modules(NGTCP2 ${NGTCP2_PC_REQUIRES})
if(_ngtcp2_crypto_backend)
pkg_check_modules("${_crypto_library_upper}" ${NGTCP2_CRYPTO_PC_REQUIRES})
else()
set("${_crypto_library_upper}_FOUND" TRUE)
endif()
endif()
list(APPEND NGTCP2_PC_REQUIRES ${NGTCP2_CRYPTO_PC_REQUIRES})
if(NGTCP2_FOUND AND "${${_crypto_library_upper}_FOUND}")
list(APPEND NGTCP2_LIBRARIES "${${_crypto_library_upper}_LIBRARIES}")
list(REMOVE_DUPLICATES NGTCP2_LIBRARIES)
if(NGTCP2_FOUND)
string(REPLACE ";" " " NGTCP2_CFLAGS "${NGTCP2_CFLAGS}")
message(STATUS "Found NGTCP2 (via pkg-config): ${NGTCP2_INCLUDE_DIRS} (found version \"${NGTCP2_VERSION}\")")
else()