[curl] Fix linker flags in curl-config and libcurl.pc for osx (#17790)

* Fix exported framework linker flags for osx

* x-add-version

* Remove cmake version check

* Update git-tree
This commit is contained in:
Kai Pastor 2021-07-01 16:22:56 +02:00 committed by GitHub
parent 8e6f6a382e
commit ab3a2b5e09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 2 deletions

View File

@ -0,0 +1,16 @@
diff -urw a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2021-05-10 20:46:52.204346972 +0200
+++ b/CMakeLists.txt 2021-05-11 19:39:00.065235266 +0200
@@ -1482,6 +1482,12 @@
message(WARNING "Bad lib in library list: ${_libname}")
continue()
endif()
+ elseif(_lib MATCHES "^(.*)/([^/]*)[.]framework$")
+ if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES)
+ set(_lib "-framework ${CMAKE_MATCH_2}")
+ else()
+ set(_lib "-framework ${_lib}")
+ endif()
endif()
if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-")
set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}")

View File

@ -13,6 +13,7 @@ vcpkg_from_github(
0010_fix_othertests_cmake.patch
0011_fix_static_build.patch
0012-fix-dependency-idn2.patch
0020-fix-pc-file.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)

View File

@ -1,7 +1,7 @@
{
"name": "curl",
"version": "7.74.0",
"port-version": 7,
"port-version": 8,
"description": "A library for transferring data with URLs",
"homepage": "https://github.com/curl/curl",
"dependencies": [

View File

@ -1562,7 +1562,7 @@
},
"curl": {
"baseline": "7.74.0",
"port-version": 7
"port-version": 8
},
"curlpp": {
"baseline": "2018-06-15-3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cd05855cc1cd2d0f221664f0bfbe639b685fa028",
"version": "7.74.0",
"port-version": 8
},
{
"git-tree": "2184d79bb98ed36af015203385175cade013d8af",
"version": "7.74.0",