From: Viktor Szakats <commit@vsz.me>
Date: Sat, 17 Aug 2024 22:10:39 +0000 (+0200)
Subject: cmake/FindNettle: skip `pkg-config` for custom configs
X-Git-Tag: curl-8_10_0~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47849be5d5f251e3f4003d21528dc2f102e2e374;p=thirdparty%2Fcurl.git

cmake/FindNettle: skip `pkg-config` for custom configs

If either `NETTLE_INCLUDE_DIR` or `NETTLE_LIBRARY` is set to customize
the `nettle` dependency, skip `pkg-config` and use the CMake-native
detection to honor these custom settings.

Closes #14584
---

diff --git a/CMake/FindNettle.cmake b/CMake/FindNettle.cmake
index 2cd691eb08..33f3d915fb 100644
--- a/CMake/FindNettle.cmake
+++ b/CMake/FindNettle.cmake
@@ -23,7 +23,7 @@
 ###########################################################################
 # Find the nettle library
 #
-# Input variables (when CURL_USE_PKGCONFIG=OFF):
+# Input variables:
 #
 # NETTLE_INCLUDE_DIR   The nettle include directory
 # NETTLE_LIBRARY       Path to nettle library
@@ -35,7 +35,9 @@
 # NETTLE_LIBRARIES     The nettle library names
 # NETTLE_VERSION       Version of nettle
 
-if(CURL_USE_PKGCONFIG)
+if(CURL_USE_PKGCONFIG AND
+   NOT DEFINED NETTLE_INCLUDE_DIR AND
+   NOT DEFINED NETTLE_LIBRARY)
   find_package(PkgConfig QUIET)
   pkg_check_modules(NETTLE "nettle")
 endif()