From 39c06f7883f448c222082c0dbb3d9a4c5eae2826 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 22 Sep 2024 19:58:48 +0200 Subject: [PATCH] cmake: enable `CURL_USE_PKGCONFIG` for cross-`MINGW` Enable `CURL_USE_PKGCONFIG` by default for MinGW cross-builds. Note: This may cause fallouts in certain envs where `pkg-config` picks up native packages. Follow-up to e1ab01d1bd13f0ec79c97ac7e19e4b8108dce270 #14658 Follow-up to c555ab469d74756b0e3a21f797237d53f9334ce3 #14575 Closes #15005 --- CMake/curl-config.cmake.in | 2 +- CMakeLists.txt | 2 +- docs/INSTALL-CMAKE.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in index aa9eb51ffd..4612d56b4c 100644 --- a/CMake/curl-config.cmake.in +++ b/CMake/curl-config.cmake.in @@ -23,7 +23,7 @@ ########################################################################### @PACKAGE_INIT@ -if(UNIX OR VCPKG_TOOLCHAIN OR (MINGW AND NOT CMAKE_CROSSCOMPILING)) # Keep in sync with root CMakeLists.txt +if(UNIX OR VCPKG_TOOLCHAIN OR MINGW) # Keep in sync with root CMakeLists.txt set(_curl_use_pkgconfig_default ON) else() set(_curl_use_pkgconfig_default OFF) diff --git a/CMakeLists.txt b/CMakeLists.txt index b804c6970e..226ed8494e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,7 +264,7 @@ else() endif() # Override to force-disable or force-enable the use of pkg-config. -if(UNIX OR VCPKG_TOOLCHAIN OR (MINGW AND NOT CMAKE_CROSSCOMPILING)) # Keep in sync with CMake/curl-config.cmake.in +if(UNIX OR VCPKG_TOOLCHAIN OR MINGW) # Keep in sync with CMake/curl-config.cmake.in set(_curl_use_pkgconfig_default ON) else() set(_curl_use_pkgconfig_default OFF) diff --git a/docs/INSTALL-CMAKE.md b/docs/INSTALL-CMAKE.md index 7e521185c2..4e38328ee3 100644 --- a/docs/INSTALL-CMAKE.md +++ b/docs/INSTALL-CMAKE.md @@ -276,7 +276,7 @@ Details via CMake - `CURL_USE_LIBUV`: Use libuv for event-based tests. Default: `OFF` - `CURL_USE_MBEDTLS`: Enable mbedTLS for SSL/TLS. Default: `OFF` - `CURL_USE_OPENSSL`: Enable OpenSSL for SSL/TLS. Default: `ON` if no other TLS backend was enabled. -- `CURL_USE_PKGCONFIG`: Enable `pkg-config` to detect dependencies. Default: `ON` for Unix, vcpkg, MinGW if not cross-compiling. +- `CURL_USE_PKGCONFIG`: Enable `pkg-config` to detect dependencies. Default: `ON` for Unix, vcpkg, MinGW. - `CURL_USE_RUSTLS`: Enable Rustls for SSL/TLS. Default: `OFF` - `CURL_USE_SCHANNEL`: Enable Windows native SSL/TLS (Schannel). Default: `OFF` - `CURL_USE_SECTRANSP`: Enable Apple OS native SSL/TLS (Secure Transport). Default: `OFF`