mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 16:13:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4231 from fcharlie/update_curl

Browse Source 
[curl] update curl to 7.61.1 nghttp2 to 1.33.0
This commit is contained in:
Alexander Karatarakis 2018-09-06 15:12:08 -07:00 committed by GitHub
commit e20e8d9b54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ports/curl/0001_cmake.patch
View File

@ -1,28 +1,28 @@
diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake
index 12a7c61..9839c67 100644
index 84822dba7..0d6219425 100644
--- a/CMake/FindLibSSH2.cmake
+++ b/CMake/FindLibSSH2.cmake
@@ -12,7 +12,7 @@ endif (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)
FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h
@@ -12,7 +12,7 @@ endif()
find_path(LIBSSH2_INCLUDE_DIR libssh2.h
)
-FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2
+FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 libssh2
-find_library(LIBSSH2_LIBRARY NAMES ssh2
+find_library(LIBSSH2_LIBRARY NAMES ssh2 libssh2
)
if(LIBSSH2_INCLUDE_DIR)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b73b98..6c7c559 100644
index e6dbb73f1..1e2ff138e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1132,7 +1132,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE)
@@ -1144,7 +1144,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE)
endfunction()
-if(WIN32 AND NOT CYGWIN)
+if(MSVC)
+ set(CURL_INSTALL_CMAKE_DIR share/curl)
+ set(CURL_INSTALL_CMAKE_DIR share/curl)
+elseif(WIN32 AND NOT CYGWIN)
set(CURL_INSTALL_CMAKE_DIR CMake)
set(CURL_INSTALL_CMAKE_DIR CMake)
else()
set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl)
set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl)

2
ports/curl/0004_nghttp2_staticlib.patch
View File

@ -6,7 +6,7 @@ index 490cc19..51c0a92 100644
find_package(NGHTTP2 REQUIRED)
include_directories(${NGHTTP2_INCLUDE_DIRS})
list(APPEND CURL_LIBS ${NGHTTP2_LIBRARIES})
+ if(CURL_STATICLIB)
+ if(NOT BUILD_SHARED_LIBS)
+ add_definitions(-DNGHTTP2_STATICLIB)
+ endif()
endif()

2
ports/curl/CONTROL
View File

@ -1,5 +1,5 @@
Source: curl
Version: 7.61.0
Version: 7.61.1
Build-Depends: zlib
Description: A library for transferring data with URLs
Default-Features: ssl

4
ports/curl/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF curl-7_61_0
SHA512 b6d2f57059e72139540cb93b945703857cb447920ed9b283993611453fed623432290adc5a3558181e3decc15c7cf54fff475010d922957807a37d1a1449be6c
REF curl-7_61_1
SHA512 09fa3c87f8d516eabe3241247a5094c32ee0481961cf85bf78ecb13acdf23bb2ec82f113d2660271d22742c79e76d73fb122730fa28e34c7f5477c05a4a6534c
HEAD_REF master
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch

2
ports/nghttp2/CONTROL
View File

@ -1,3 +1,3 @@
Source: nghttp2
Version: 1.32.1
Version: 1.33.0
Description: Implementation of the Hypertext Transfer Protocol version 2 in C

4
ports/nghttp2/portfile.cmake
View File

@ -1,7 +1,7 @@
include(vcpkg_common_functions)
set(LIB_NAME nghttp2)
set(LIB_VERSION 1.32.1)
set(LIB_VERSION 1.33.0)
set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
@ -9,7 +9,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/nghttp2/nghttp2/releases/download/v${LIB_VERSION}/${LIB_FILENAME}"
FILENAME "${LIB_FILENAME}"
SHA512 8f138e96ad7029711d3c177267dcd35759867d711a935212b2257e20ef9a274c65d247b5d44f03d81edc8f52cb5fb1b751ae102cebcac39d102c1637ad040903
SHA512 39c37a6579d1da6a6bcfb32c822f59943796ef4c11d82146924b8e279653c4afca496b6cc7fd65b0181f95fa5007a2dd0589038d6f4354c75d65e60d29528268
)
vcpkg_extract_source_archive(${ARCHIVE})