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

cmake: limit pkg-config to UNIX and MSVC+vcpkg by default

Browse source 
Limits `pkg-config` to UNIX and MSVC with vcpkg, by default. Compared to
curl 8.9.1, this unlocks `pkg-config` on MSVC with vcpkg.

This condition might be updated in the future depending on where
`pkg-config` can be useful without breaking things. (e.g. to non-cross
MINGW, or all MINGW).

In the meantime everyone is free to override the default and test their
build with `pkg-config` by setting the `CURL_USE_PKGCONFIG=ON` CMake
option.

Closes #14575
This commit is contained in:
Viktor Szakats 2024-08-17 01:08:45 +02:00
parent 211cbcb4f6
commit c555ab469d
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMake/curl-config.cmake.in
View file

@ -24,7 +24,7 @@
@PACKAGE_INIT@
if(NOT DEFINED CURL_USE_PKGCONFIG)
if(NOT MSVC OR VCPKG_TOOLCHAIN)
if(UNIX OR (MSVC AND VCPKG_TOOLCHAIN)) # Keep this in sync with root CMakeLists.txt
set(CURL_USE_PKGCONFIG ON)
else()
set(CURL_USE_PKGCONFIG OFF)

2
CMakeLists.txt
View file

@ -208,7 +208,7 @@ else()
endif()
# Override to force-disable or force-enable the use of pkg-config.
if(NOT MSVC OR VCPKG_TOOLCHAIN)
if(UNIX OR (MSVC AND VCPKG_TOOLCHAIN)) # Keep this in sync with CMake/curl-config.cmake.in
set(_curl_use_pkgconfig_default ON)
else()
set(_curl_use_pkgconfig_default OFF)