mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 09:08:59 +08:00
[curl] Update (#31710)
This commit is contained in:
parent
69f86f893f
commit
d8e5ba9b45
@ -1,7 +1,7 @@
|
||||
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||||
index 1d71e14..62b7b33 100644
|
||||
--- a/lib/CMakeLists.txt
|
||||
+++ b/lib/CMakeLists.txt
|
||||
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||||
index 1d71e14..62b7b33 100644
|
||||
--- a/lib/CMakeLists.txt
|
||||
+++ b/lib/CMakeLists.txt
|
||||
@@ -125,7 +125,6 @@ if(WIN32)
|
||||
if(MSVC)
|
||||
# Add "_imp" as a suffix before the extension to avoid conflicting with
|
||||
@ -9,4 +9,4 @@ index 1d71e14..62b7b33 100644
|
||||
- set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
elseif(NOT CMAKE_CROSSCOMPILING)
|
||||
|
@ -2,8 +2,8 @@ string(REPLACE "." "_" curl_version "curl-${VERSION}")
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO curl/curl
|
||||
REF ${curl_version}
|
||||
SHA512 4a7aa0091ac1e0f1d4366277d585c19bd9ad786fa49329a96d43eb6aebd1b366c1c2144436c243686d9ad430e7d3f4137ea0764c7759198f0eb29107a5d86569
|
||||
REF "${curl_version}"
|
||||
SHA512 d3c0bd113c772249c7e4e83cc26c6e2a1ff5644486c96318de6ab035300c52aca10756af665d91c5ce71f9d4afa4afbf7fbb756e9e4c800869b50c8a653bd519
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0002_fix_uwp.patch
|
||||
@ -14,7 +14,6 @@ vcpkg_from_github(
|
||||
mbedtls-ws2_32.patch
|
||||
export-components.patch
|
||||
0023-fix-find-cares.patch
|
||||
version-major-7-8.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
@ -73,6 +72,7 @@ vcpkg_cmake_configure(
|
||||
-DENABLE_MANUAL=OFF
|
||||
-DCURL_CA_FALLBACK=ON
|
||||
-DCURL_USE_LIBPSL=OFF
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
|
||||
OPTIONS_DEBUG
|
||||
-DENABLE_DEBUG=ON
|
||||
)
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "curl",
|
||||
"version": "8.0.1",
|
||||
"version": "8.1.2",
|
||||
"description": "A library for transferring data with URLs",
|
||||
"homepage": "https://curl.se/",
|
||||
"license": null,
|
||||
|
@ -1,20 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ed60f07bc..270a562d9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1609,6 +1609,15 @@ write_basic_package_version_file(
|
||||
VERSION ${CURL_VERSION}
|
||||
COMPATIBILITY SameMajorVersion
|
||||
)
|
||||
+file(READ "${version_config}" generated_version_config)
|
||||
+file(WRITE "${version_config}" "
|
||||
+if(NOT PACKAGE_FIND_VERSION_RANGE AND PACKAGE_FIND_VERSION_MAJOR STREQUAL \"7\")
|
||||
+ # Version 8 satisfies version 7... requirements
|
||||
+ set(PACKAGE_FIND_VERSION_MAJOR 8)
|
||||
+ set(PACKAGE_FIND_VERSION_COUNT 1)
|
||||
+endif()
|
||||
+${generated_version_config}"
|
||||
+)
|
||||
|
||||
# Use:
|
||||
# * TARGETS_EXPORT_NAME
|
@ -1941,7 +1941,7 @@
|
||||
"port-version": 8
|
||||
},
|
||||
"curl": {
|
||||
"baseline": "8.0.1",
|
||||
"baseline": "8.1.2",
|
||||
"port-version": 0
|
||||
},
|
||||
"curlpp": {
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b70ded19f70e4b198d8c3f844324c7884d3faa7d",
|
||||
"version": "8.1.2",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "08eea1b0a159f6555603ac8d26a9f8ab4738d02f",
|
||||
"version": "8.0.1",
|
||||
|
Loading…
Reference in New Issue
Block a user