mirror of
https://github.com/curl/curl.git
synced 2026-06-18 11:25:39 +03:00
rename property to the INTERFACE_ namespace for cmake <3.19 compatibility
Seems to silence: ``` CMake Error at CMake/FindGSS.cmake:360 (set_target_properties): INTERFACE_LIBRARY targets may only have whitelisted properties. The property "CURL_PC_MODULES" is not allowed. Call Stack (most recent call first): CMakeLists.txt:1306 (find_package) ```
This commit is contained in:
parent
46d42ed681
commit
a0216a994c
22 changed files with 24 additions and 26 deletions
|
|
@ -80,7 +80,7 @@ if(BROTLI_FOUND)
|
|||
if(NOT TARGET CURL::brotli)
|
||||
add_library(CURL::brotli INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::brotli PROPERTIES
|
||||
CURL_PC_MODULES "${_brotli_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_brotli_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_brotli_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_brotli_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_brotli_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ if(CARES_FOUND)
|
|||
if(NOT TARGET CURL::cares)
|
||||
add_library(CURL::cares INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::cares PROPERTIES
|
||||
CURL_PC_MODULES "${_cares_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_cares_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_cares_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_cares_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_cares_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ if(GSS_FOUND)
|
|||
|
||||
add_library(CURL::gss INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::gss PROPERTIES
|
||||
CURL_PC_MODULES "${_gss_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_gss_pc_requires}"
|
||||
CURL_GSS_FLAVOUR "${_gss_flavour}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_gss_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_gss_INCLUDE_DIRS}"
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ if(LDAP_FOUND)
|
|||
if(NOT TARGET CURL::ldap)
|
||||
add_library(CURL::ldap INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::ldap PROPERTIES
|
||||
CURL_PC_MODULES "${_ldap_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_ldap_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_ldap_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_ldap_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_ldap_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ if(LIBGSASL_FOUND)
|
|||
if(NOT TARGET CURL::libgsasl)
|
||||
add_library(CURL::libgsasl INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::libgsasl PROPERTIES
|
||||
CURL_PC_MODULES "${_libgsasl_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_libgsasl_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_libgsasl_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_libgsasl_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_libgsasl_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ if(LIBIDN2_FOUND)
|
|||
if(NOT TARGET CURL::libidn2)
|
||||
add_library(CURL::libidn2 INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::libidn2 PROPERTIES
|
||||
CURL_PC_MODULES "${_libidn2_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_libidn2_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_libidn2_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_libidn2_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_libidn2_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ if(LIBPSL_FOUND)
|
|||
if(NOT TARGET CURL::libpsl)
|
||||
add_library(CURL::libpsl INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::libpsl PROPERTIES
|
||||
CURL_PC_MODULES "${_libpsl_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_libpsl_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_libpsl_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_libpsl_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_libpsl_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ if(LIBRTMP_FOUND)
|
|||
if(NOT TARGET CURL::librtmp)
|
||||
add_library(CURL::librtmp INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::librtmp PROPERTIES
|
||||
CURL_PC_MODULES "${_librtmp_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_librtmp_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_librtmp_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_librtmp_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_librtmp_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ if(LIBSSH_FOUND)
|
|||
if(NOT TARGET CURL::libssh)
|
||||
add_library(CURL::libssh INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::libssh PROPERTIES
|
||||
CURL_PC_MODULES "${_libssh_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_libssh_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_libssh_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_libssh_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_libssh_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ if(LIBSSH2_FOUND)
|
|||
if(NOT TARGET CURL::libssh2)
|
||||
add_library(CURL::libssh2 INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::libssh2 PROPERTIES
|
||||
CURL_PC_MODULES "${_libssh2_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_libssh2_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_libssh2_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_libssh2_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_libssh2_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ if(LIBUV_FOUND)
|
|||
add_library(CURL::libuv INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::libuv PROPERTIES
|
||||
VERSION "${LIBUV_VERSION}"
|
||||
CURL_PC_MODULES "${_libuv_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_libuv_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_libuv_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_libuv_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_libuv_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ if(MBEDTLS_FOUND)
|
|||
if(NOT TARGET CURL::mbedtls)
|
||||
add_library(CURL::mbedtls INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::mbedtls PROPERTIES
|
||||
CURL_PC_MODULES "${_mbedtls_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_mbedtls_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_mbedtls_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_mbedtls_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_mbedtls_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ if(NGHTTP2_FOUND)
|
|||
if(NOT TARGET CURL::nghttp2)
|
||||
add_library(CURL::nghttp2 INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::nghttp2 PROPERTIES
|
||||
CURL_PC_MODULES "${_nghttp2_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_nghttp2_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_nghttp2_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_nghttp2_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_nghttp2_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ if(NGHTTP3_FOUND)
|
|||
if(NOT TARGET CURL::nghttp3)
|
||||
add_library(CURL::nghttp3 INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::nghttp3 PROPERTIES
|
||||
CURL_PC_MODULES "${_nghttp3_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_nghttp3_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_nghttp3_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_nghttp3_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_nghttp3_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ if(NGTCP2_FOUND)
|
|||
if(NOT TARGET CURL::ngtcp2)
|
||||
add_library(CURL::ngtcp2 INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::ngtcp2 PROPERTIES
|
||||
CURL_PC_MODULES "${_ngtcp2_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_ngtcp2_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_ngtcp2_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_ngtcp2_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_ngtcp2_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ if(NETTLE_FOUND)
|
|||
if(NOT TARGET CURL::nettle)
|
||||
add_library(CURL::nettle INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::nettle PROPERTIES
|
||||
CURL_PC_MODULES "${_nettle_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_nettle_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_nettle_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_nettle_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_nettle_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ if(QUICHE_FOUND)
|
|||
if(NOT TARGET CURL::quiche)
|
||||
add_library(CURL::quiche INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::quiche PROPERTIES
|
||||
CURL_PC_MODULES "${_quiche_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_quiche_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_quiche_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_quiche_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_quiche_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ if(RUSTLS_FOUND)
|
|||
if(NOT TARGET CURL::rustls)
|
||||
add_library(CURL::rustls INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::rustls PROPERTIES
|
||||
CURL_PC_MODULES "${_rustls_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_rustls_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_rustls_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_rustls_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_rustls_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ if(WOLFSSL_FOUND)
|
|||
if(NOT TARGET CURL::wolfssl)
|
||||
add_library(CURL::wolfssl INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::wolfssl PROPERTIES
|
||||
CURL_PC_MODULES "${_wolfssl_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_wolfssl_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_wolfssl_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_wolfssl_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_wolfssl_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ if(ZSTD_FOUND)
|
|||
if(NOT TARGET CURL::zstd)
|
||||
add_library(CURL::zstd INTERFACE IMPORTED)
|
||||
set_target_properties(CURL::zstd PROPERTIES
|
||||
CURL_PC_MODULES "${_zstd_pc_requires}"
|
||||
INTERFACE_CURL_PC_MODULES "${_zstd_pc_requires}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_zstd_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_zstd_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_zstd_LIBRARY_DIRS}"
|
||||
|
|
|
|||
|
|
@ -59,7 +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")
|
||||
list(APPEND _cmake_property_list "INTERFACE_CURL_PC_MODULES")
|
||||
foreach(_prop IN LISTS _cmake_property_list)
|
||||
if(_prop MATCHES "<CONFIG>")
|
||||
foreach(_config IN ITEMS "DEBUG" "RELEASE" "MINSIZEREL" "RELWITHDEBINFO")
|
||||
|
|
|
|||
|
|
@ -45,8 +45,6 @@ if(NOT "$ENV{CURL_BUILDINFO}$ENV{CURL_CI}$ENV{CI}" STREQUAL "")
|
|||
endforeach()
|
||||
endif()
|
||||
|
||||
define_property(TARGET PROPERTY CURL_PC_MODULES BRIEF_DOCS "pkg-config modules")
|
||||
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
|
||||
include(Utilities)
|
||||
include(Macros)
|
||||
|
|
@ -755,7 +753,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 CURL_PC_MODULES "openssl")
|
||||
set_target_properties(OpenSSL::SSL PROPERTIES INTERFACE_CURL_PC_MODULES "openssl")
|
||||
|
||||
if(CURL_DEFAULT_SSL_BACKEND AND CURL_DEFAULT_SSL_BACKEND STREQUAL "openssl")
|
||||
set(_valid_default_ssl_backend TRUE)
|
||||
|
|
@ -916,7 +914,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 CURL_PC_MODULES "zlib")
|
||||
set_target_properties(ZLIB::ZLIB PROPERTIES INTERFACE_CURL_PC_MODULES "zlib")
|
||||
endif()
|
||||
|
||||
set(HAVE_BROTLI OFF)
|
||||
|
|
@ -2136,7 +2134,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}" CURL_PC_MODULES)
|
||||
get_target_property(_modules "${_lib}" INTERFACE_CURL_PC_MODULES)
|
||||
if(_modules)
|
||||
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "${_modules}")
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue