Merge pull request #2671 from fcharlie/curl_http2

curl support http2, use nghttp2
This commit is contained in:
Alexander Karatarakis 2018-01-31 23:41:06 -08:00 committed by GitHub
commit 1d8137d513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions

View File

@ -1,5 +1,5 @@
Source: curl
Version: 7.58.0
Build-Depends: zlib, openssl, libssh2
Version: 7.58.0-1
Build-Depends: zlib, openssl, libssh2, nghttp2
Description: A library for transferring data with URLs
# For WINSSL create target triplet which contains set(CURL_USE_WINSSL ON)

View File

@ -14,8 +14,13 @@ vcpkg_apply_patches(
${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch
)
# Support HTTP2 TSL Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location.
SET(HTTP2_OPTIONS)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
SET(CURL_STATICLIB OFF)
SET(HTTP2_OPTIONS
-DUSE_NGHTTP2=ON
)
else()
SET(CURL_STATICLIB ON)
endif()
@ -24,6 +29,7 @@ set(USE_OPENSSL ON)
if(CURL_USE_WINSSL)
set(USE_OPENSSL OFF)
set(USE_WINSSL ON)
set(HTTP2_OPTIONS) ## disable HTTP2 when CURL_USE_WINSSL
endif()
set(UWP_OPTIONS)
@ -34,6 +40,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-DENABLE_IPV6=OFF
-DENABLE_UNIX_SOCKETS=OFF
)
set(HTTP2_OPTIONS) ## disable curl HTTP2 support
endif()
vcpkg_find_acquire_program(PERL)
@ -45,6 +52,7 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
${UWP_OPTIONS}
${HTTP2_OPTIONS}
-DBUILD_TESTING=OFF
-DBUILD_CURL_EXE=OFF
-DENABLE_MANUAL=OFF