From 8498b1b9533b60dca4436595e4ebbbe39651872f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 12 Sep 2024 03:34:31 +0200 Subject: [PATCH] cmake/FindNGTCP2: use library path as hint for finding the crypto module It allows finding the ngtcp2 crypto interface library automatically when using a custom `NGTCP2_LIBRARY`. Before this patch the library location had to be added via `CMAKE_LIBRARY_PATH` or by other means. Also add empty lines for readability / uniformity. Fixes https://github.com/curl/curl-for-win/blob/8b8909e1206de1dcca356a8dd33eb1e4ffeea7fd/curl.sh#L289 Closes #14905 --- CMake/FindNGTCP2.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMake/FindNGTCP2.cmake b/CMake/FindNGTCP2.cmake index 194483d54c..c6d66bfb78 100644 --- a/CMake/FindNGTCP2.cmake +++ b/CMake/FindNGTCP2.cmake @@ -84,14 +84,19 @@ if(NGTCP2_FIND_COMPONENTS) if(_ngtcp2_crypto_backend) string(TOLOWER "ngtcp2_crypto_${_ngtcp2_crypto_backend}" _crypto_library) + if(CURL_USE_PKGCONFIG) pkg_check_modules(PC_${_crypto_library} "lib${_crypto_library}") endif() + + get_filename_component(_ngtcp2_library_dir "${NGTCP2_LIBRARY}" DIRECTORY) find_library(${_crypto_library}_LIBRARY NAMES ${_crypto_library} HINTS + ${_ngtcp2_library_dir} ${PC_${_crypto_library}_LIBDIR} ${PC_${_crypto_library}_LIBRARY_DIRS} ) + if(${_crypto_library}_LIBRARY) set(NGTCP2_${_ngtcp2_crypto_backend}_FOUND TRUE) set(NGTCP2_CRYPTO_LIBRARY ${${_crypto_library}_LIBRARY}) -- 2.47.3