From 01e45f81bddb2fef27fe35b7dd32032062a183f6 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 5 Apr 2025 20:09:50 +0200 Subject: [PATCH] cmake/FindNGTCP2: simplify multi-pkg-config detection Use a single `pkg_check_modules` call to detect the main & crypto libs. Follow-up to 3b501976a9adcf20218ffb96d9041806432227e4 #16479 Closes #16980 --- CMake/FindNGTCP2.cmake | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/CMake/FindNGTCP2.cmake b/CMake/FindNGTCP2.cmake index 0cbb3484d1..63f3ca27a8 100644 --- a/CMake/FindNGTCP2.cmake +++ b/CMake/FindNGTCP2.cmake @@ -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() -- 2.47.2