mirror of https://github.com/microsoft/vcpkg.git
[curl] Update to 8.13.0 (#44658)
This commit is contained in:
parent
13306d5437
commit
68362f1556
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||||
index b838245..3199160 100644
|
||||
--- a/lib/CMakeLists.txt
|
||||
+++ b/lib/CMakeLists.txt
|
||||
@@ -92,7 +92,6 @@ endif()
|
||||
if(WIN32 AND
|
||||
NOT IMPORT_LIB_SUFFIX AND
|
||||
CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL CMAKE_IMPORT_LIBRARY_SUFFIX)
|
||||
- set(IMPORT_LIB_SUFFIX "_imp")
|
||||
endif()
|
||||
|
||||
# Whether to do a single compilation pass for libcurl sources and reuse these
|
||||
|
|
@ -43,7 +43,7 @@ index 86add74..be7b193 100644
|
|||
if(BROTLI_FOUND)
|
||||
set(HAVE_BROTLI ON)
|
||||
- list(APPEND CURL_LIBS ${BROTLI_LIBRARIES})
|
||||
+ list(APPEND CURL_LIBS ${BROTLIDEC_LINK_LIBRARIES})
|
||||
+ list(APPEND CURL_LIBS ${BROTLI_LINK_LIBRARIES})
|
||||
list(APPEND CURL_LIBDIRS ${BROTLI_LIBRARY_DIRS})
|
||||
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${BROTLI_PC_REQUIRES})
|
||||
include_directories(SYSTEM ${BROTLI_INCLUDE_DIRS})
|
||||
|
|
|
|||
|
|
@ -4,10 +4,9 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO curl/curl
|
||||
REF ${curl_version}
|
||||
SHA512 04f6160c3c63c59e80987df61959bf0079c5be1d63bc40189933cebd3046850d680f1e030e8e7cd7f04417146982c6410ba70c8441af75d43b7b24fc7fbcb1d2
|
||||
SHA512 083591171202ea26fcb22ffa9c52286c76c7ff8dcea0a5e8a616737eee8672ab8bfffaa230e84b05450c0acb1f3e5f402d4f6aca46bd52fd6e812b68eadfca27
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0005_remove_imp_suffix.patch
|
||||
export-components.patch
|
||||
dependencies.patch
|
||||
pkgconfig-curl-config.patch
|
||||
|
|
@ -72,6 +71,7 @@ vcpkg_cmake_configure(
|
|||
${OPTIONS}
|
||||
-DBUILD_TESTING=OFF
|
||||
-DENABLE_CURL_MANUAL=OFF
|
||||
-DIMPORT_LIB_SUFFIX= # empty
|
||||
-DSHARE_LIB_OBJECT=OFF
|
||||
-DCURL_CA_FALLBACK=ON
|
||||
-DCURL_USE_PKGCONFIG=ON
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "curl",
|
||||
"version": "8.12.1",
|
||||
"version": "8.13.0",
|
||||
"description": "A library for transferring data with URLs",
|
||||
"homepage": "https://curl.se/",
|
||||
"license": "curl AND ISC AND BSD-3-Clause",
|
||||
|
|
|
|||
|
|
@ -2149,7 +2149,7 @@
|
|||
"port-version": 8
|
||||
},
|
||||
"curl": {
|
||||
"baseline": "8.12.1",
|
||||
"baseline": "8.13.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"curlcpp": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "242c3849525ab4b1e253b375eeb37f11898f0785",
|
||||
"version": "8.13.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "faa9e75a688eeb7144584f9a86c014cefffddb98",
|
||||
"version": "8.12.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue