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

Merge pull request #3476 from matttyson/curl

Browse Source 
Fix Windows curl/nghttp2 static build
This commit is contained in:
Alexander Karatarakis 2018-05-19 22:30:33 -07:00 committed by GitHub
commit f796ee4d60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/curl/0004_nghttp2_staticlib.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 490cc19..51c0a92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,6 +388,9 @@ if(USE_NGHTTP2)
find_package(NGHTTP2 REQUIRED)
include_directories(${NGHTTP2_INCLUDE_DIRS})
list(APPEND CURL_LIBS ${NGHTTP2_LIBRARIES})
+ if(CURL_STATICLIB)
+ add_definitions(-DNGHTTP2_STATICLIB)
+ endif()
endif()
if(NOT CURL_DISABLE_LDAP)

2
ports/curl/CONTROL
View File

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

1
ports/curl/portfile.cmake
View File

@ -13,6 +13,7 @@ vcpkg_apply_patches(
${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch
${CMAKE_CURRENT_LIST_DIR}/0003_fix_libraries.patch
${CMAKE_CURRENT_LIST_DIR}/0004_nghttp2_staticlib.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)