romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-02 17:50:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

rename custom prop and include in dumper

Browse source
This commit is contained in:
Viktor Szakats 2025-03-27 01:35:04 +01:00
parent 0edc16e922
commit 46d42ed681
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMake/Utilities.cmake
View file

@ -59,6 +59,7 @@ function(curl_dumptargetprops _target)
string(REPLACE "\n" ";" _cmake_property_list "${_cmake_property_list}")
list(REMOVE_DUPLICATES _cmake_property_list)
list(REMOVE_ITEM _cmake_property_list "")
list(APPEND _cmake_property_list "CURL_PC_MODULES")
foreach(_prop IN LISTS _cmake_property_list)
if(_prop MATCHES "<CONFIG>")
foreach(_config IN ITEMS "DEBUG" "RELEASE" "MINSIZEREL" "RELWITHDEBINFO")

6
CMakeLists.txt
View file

@ -755,7 +755,7 @@ if(CURL_USE_OPENSSL)
# Depend on OpenSSL via imported targets. This allows our dependents to
# get our dependencies transitively.
list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto)
set_target_properties(OpenSSL::SSL PROPERTIES LIBCURL_PC_MODULES "openssl")
set_target_properties(OpenSSL::SSL PROPERTIES CURL_PC_MODULES "openssl")
if(CURL_DEFAULT_SSL_BACKEND AND CURL_DEFAULT_SSL_BACKEND STREQUAL "openssl")
set(_valid_default_ssl_backend TRUE)
@ -916,7 +916,7 @@ if(ZLIB_FOUND)
# Depend on ZLIB via imported targets. This allows our dependents to
# get our dependencies transitively.
list(APPEND CURL_LIBS ZLIB::ZLIB)
set_target_properties(ZLIB::ZLIB PROPERTIES LIBCURL_PC_MODULES "zlib")
set_target_properties(ZLIB::ZLIB PROPERTIES CURL_PC_MODULES "zlib")
endif()
set(HAVE_BROTLI OFF)
@ -2136,7 +2136,7 @@ if(NOT CURL_DISABLE_INSTALL)
if(NOT _libname AND NOT _libs AND NOT _libdirs)
message(WARNING "Bad lib in library list: ${_lib}")
endif()
get_target_property(_modules "${_lib}" LIBCURL_PC_MODULES)
get_target_property(_modules "${_lib}" CURL_PC_MODULES)
if(_modules)
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "${_modules}")
endif()