mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-25 04:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3523 from fcharlie/fcharlie_update

Browse Source 
[nghttp2] update to 1.32.0
This commit is contained in:
Alexander Karatarakis 2018-05-19 23:27:33 -07:00 committed by GitHub
commit e428da2b23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/nghttp2/CONTROL
View File

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

18
ports/nghttp2/enable-static.patch
View File

@ -1,23 +1,27 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0846d06..290679f 100644
index 17e422b..b2e7a6e 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -38,7 +38,7 @@ if(WIN32)
@@ -37,8 +37,8 @@ if(WIN32)
set(NGHTTP2_RES ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
endif()
# Public shared library
-# Public shared library
-add_library(nghttp2 SHARED ${NGHTTP2_SOURCES} ${NGHTTP2_RES})
+# Public library
+add_library(nghttp2 ${NGHTTP2_SOURCES} ${NGHTTP2_RES})
set_target_properties(nghttp2 PROPERTIES
COMPILE_FLAGS "${WARNCFLAGS}"
VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
@@ -48,6 +48,9 @@ target_include_directories(nghttp2 INTERFACE
"${CMAKE_CURRENT_BINARY_DIR}/includes"
@@ -49,6 +49,10 @@ target_include_directories(nghttp2 INTERFACE
"${CMAKE_CURRENT_SOURCE_DIR}/includes"
)
+if(NOT BUILD_SHARED_LIBS)
+ target_compile_definitions(nghttp2 PUBLIC "-DNGHTTP2_STATICLIB")
+endif()
if(HAVE_CUNIT)
+
if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
# Static library (for unittests because of symbol visibility)
add_library(nghttp2_static STATIC ${NGHTTP2_SOURCES})

4
ports/nghttp2/portfile.cmake
View File

@ -1,7 +1,7 @@
include(vcpkg_common_functions)
set(LIB_NAME nghttp2)
set(LIB_VERSION 1.30.0)
set(LIB_VERSION 1.32.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 26ce717a085e9fbdf8e644d4c8ab6961ca60029c4dfa112c9932523d1c4cc3f40fda4283afddf78a649e7f6fb7d3f3bfce3197186a4f70819b5996e8158089da
SHA512 f5bd36230cd42bd544d75b71af44f2fa2798363ddc1efb05499f6c8e86d54acfe6fde20f3d544ed560324a30141408dba6bc7e03e5f03ee7f7df532fb21aecbd
)
vcpkg_extract_source_archive(${ARCHIVE})