0793c98027
Viktor Szakats
2026-03-16
Subject
cmake: rework binutils ld hack to not read `LOCATION` property
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
CMake/curl-config.in.cmake+2 -4
| @@ -42,8 +42,7 @@ if("@USE_OPENSSL@") | |
| # Define lib duplicate to fixup lib order for GCC binutils ld in static builds | |
| if(TARGET OpenSSL::Crypto AND NOT TARGET CURL::OpenSSL_Crypto) | |
| add_library(CURL::OpenSSL_Crypto INTERFACE IMPORTED) | |
| - | get_target_property(_curl_libname OpenSSL::Crypto LOCATION) |
| - | set_target_properties(CURL::OpenSSL_Crypto PROPERTIES INTERFACE_LINK_LIBRARIES "${_curl_libname}") |
| + | set_target_properties(CURL::OpenSSL_Crypto PROPERTIES INTERFACE_LINK_LIBRARIES OpenSSL::Crypto) |
| endif() | |
| endif() | |
| if("@HAVE_LIBZ@") | |
| @@ -51,8 +50,7 @@ if("@HAVE_LIBZ@") | |
| # Define lib duplicate to fixup lib order for GCC binutils ld in static builds | |
| if(TARGET ZLIB::ZLIB AND NOT TARGET CURL::ZLIB) | |
| add_library(CURL::ZLIB INTERFACE IMPORTED) | |
| - | get_target_property(_curl_libname ZLIB::ZLIB LOCATION) |
| - | set_target_properties(CURL::ZLIB PROPERTIES INTERFACE_LINK_LIBRARIES "${_curl_libname}") |
| + | set_target_properties(CURL::ZLIB PROPERTIES INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) |
| endif() | |
| endif() | |
CMakeLists.txt+6 -14
| @@ -1843,22 +1843,14 @@ endif() | |
| # to consume libcurl, regardless of the compiler used to build libcurl itself. | |
| if(CMAKE_C_COMPILER_ID STREQUAL "GNU") | |
| if(USE_OPENSSL AND TARGET OpenSSL::Crypto) | |
| - | get_target_property(_curl_imported OpenSSL::Crypto IMPORTED) |
| - | if(_curl_imported) |
| - | add_library(CURL::OpenSSL_Crypto INTERFACE IMPORTED) |
| - | get_target_property(_curl_libname OpenSSL::Crypto LOCATION) |
| - | set_target_properties(CURL::OpenSSL_Crypto PROPERTIES INTERFACE_LINK_LIBRARIES "${_curl_libname}") |
| - | list(APPEND CURL_LIBS CURL::OpenSSL_Crypto) |
| - | endif() |
| + | add_library(CURL::OpenSSL_Crypto INTERFACE IMPORTED) |
| + | set_target_properties(CURL::OpenSSL_Crypto PROPERTIES INTERFACE_LINK_LIBRARIES OpenSSL::Crypto) |
| + | list(APPEND CURL_LIBS CURL::OpenSSL_Crypto) |
| endif() | |
| if(HAVE_LIBZ AND TARGET ZLIB::ZLIB) | |
| - | get_target_property(_curl_imported ZLIB::ZLIB IMPORTED) |
| - | if(_curl_imported) |
| - | add_library(CURL::ZLIB INTERFACE IMPORTED) |
| - | get_target_property(_curl_libname ZLIB::ZLIB LOCATION) |
| - | set_target_properties(CURL::ZLIB PROPERTIES INTERFACE_LINK_LIBRARIES "${_curl_libname}") |
| - | list(APPEND CURL_LIBS CURL::ZLIB) |
| - | endif() |
| + | add_library(CURL::ZLIB INTERFACE IMPORTED) |
| + | set_target_properties(CURL::ZLIB PROPERTIES INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) |
| + | list(APPEND CURL_LIBS CURL::ZLIB) |
| endif() | |
| if(WIN32) | |
| add_library(CURL::win32_winsock INTERFACE IMPORTED) | |