luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: drop if(PKG_CONFIG_FOUND) guard for pkg_check_modules()

Browse Source 
The oldest cmake supported by curl is v3.7.0, which already has such
guard (using `PKG_CONFIG_EXECUTABLE`) inside `pkg_check_modules()`. The
advantage of leaving that guard to CMake is that it will define/reset
all output variables, while the manual guard doesn't do this and also
leaves for example `NETTLE_FOUND` undefined.

Delete the single use of this guard from the recently added `nettle`
detection, where I included it by accident. Then possibly re-introduce
it universally if we find it useful after more evaluation.

Follow-up to 669ce42275 #14285
Closes #14309
This commit is contained in:
Viktor Szakats 2024-07-30 10:52:32 +02:00
parent d40bba3ff9
commit b92ead34dd
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMake/FindNettle.cmake
View File

@ -30,9 +30,7 @@
if(UNIX)
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
pkg_check_modules(NETTLE "nettle")
endif()
pkg_check_modules(NETTLE "nettle")
endif()
if(NETTLE_FOUND)