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

cmake: drop CURL_USE_PKGCONFIG from curl-config.cmake.in

Browse Source 
This variable was meant to be used by curl Find modules, but it turns
out it makes no sense to use those from `curl-config.cmake.in`. It means
this variable was not used before and will not be used in the future,
and therefore safe to delete.

Also add missing macros passed to `curl-config.cmake` to comment.

Ref: https://github.com/curl/curl/pull/14930#discussion_r1929537797

Closes #16087
This commit is contained in:
Viktor Szakats 2025-01-25 14:54:47 +01:00
parent 49ece646c0
commit 1bc83abfb7
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMake/curl-config.cmake.in
View File

@ -23,16 +23,6 @@
########################################################################### ###########################################################################
@PACKAGE_INIT@ @PACKAGE_INIT@
# Keep condition in sync with CMake/curl-config.cmake.in
if((UNIX AND NOT ANDROID AND (NOT APPLE OR CMAKE_SYSTEM_NAME MATCHES "Darwin")) OR
VCPKG_TOOLCHAIN OR
(MINGW AND NOT CMAKE_CROSSCOMPILING))
set(_curl_use_pkgconfig_default ON)
else()
set(_curl_use_pkgconfig_default OFF)
endif()
option(CURL_USE_PKGCONFIG "Enable pkg-config to detect @PROJECT_NAME@ dependencies" ${_curl_use_pkgconfig_default})
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
if("@USE_OPENSSL@") if("@USE_OPENSSL@")
find_dependency(OpenSSL "@OPENSSL_VERSION_MAJOR@") find_dependency(OpenSSL "@OPENSSL_VERSION_MAJOR@")

5
CMakeLists.txt
View File

@ -322,7 +322,6 @@ else()
endif() endif()
# Override to force-disable or force-enable the use of pkg-config. # Override to force-disable or force-enable the use of pkg-config.
# Keep condition in sync with CMake/curl-config.cmake.in
if((UNIX AND NOT ANDROID AND (NOT APPLE OR CMAKE_SYSTEM_NAME MATCHES "Darwin")) OR if((UNIX AND NOT ANDROID AND (NOT APPLE OR CMAKE_SYSTEM_NAME MATCHES "Darwin")) OR
VCPKG_TOOLCHAIN OR VCPKG_TOOLCHAIN OR
(MINGW AND NOT CMAKE_CROSSCOMPILING)) (MINGW AND NOT CMAKE_CROSSCOMPILING))
@ -2397,8 +2396,8 @@ if(NOT CURL_DISABLE_INSTALL)
# CURLVERSION # CURLVERSION
# LIB_SELECTED # LIB_SELECTED
# TARGETS_EXPORT_NAME # TARGETS_EXPORT_NAME
# USE_OPENSSL # USE_OPENSSL OPENSSL_VERSION_MAJOR
# HAVE_LIBZ # HAVE_LIBZ ZLIB_VERSION_MAJOR
# CURL_SUPPORTED_FEATURES_LIST # CURL_SUPPORTED_FEATURES_LIST
# CURL_SUPPORTED_PROTOCOLS_LIST # CURL_SUPPORTED_PROTOCOLS_LIST
configure_package_config_file("CMake/curl-config.cmake.in" configure_package_config_file("CMake/curl-config.cmake.in"