diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-01-31 23:41:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 23:41:06 -0800 |
| commit | 1d8137d51390f866dc05b9071f664ce49e65d9ca (patch) | |
| tree | c00031f15cf38a56dab313e766e8caf3057bd9ff | |
| parent | 44de82ef15678bb6ecbaaeefbdd319e9220e10c3 (diff) | |
| parent | 108d13a27780147f788036bf56f01148768289d2 (diff) | |
| download | vcpkg-1d8137d51390f866dc05b9071f664ce49e65d9ca.tar.gz vcpkg-1d8137d51390f866dc05b9071f664ce49e65d9ca.zip | |
Merge pull request #2671 from fcharlie/curl_http2
curl support http2, use nghttp2
| -rw-r--r-- | ports/curl/CONTROL | 4 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 450f43d59..6db37600a 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -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) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 64001704a..b13cdb309 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -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 |