diff options
| author | Matt Tyson <mtyson@mtyson.id.au> | 2018-05-11 20:13:06 +1000 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-05-19 19:43:02 -0700 |
| commit | ef5686e586f465660d3987a9f1fd4e0b6914821d (patch) | |
| tree | 99926f4fdf3e2e49592e9515cc777f0e89cef4f6 | |
| parent | 7932abed8d10b59f6a448c71349667dded004106 (diff) | |
| download | vcpkg-ef5686e586f465660d3987a9f1fd4e0b6914821d.tar.gz vcpkg-ef5686e586f465660d3987a9f1fd4e0b6914821d.zip | |
Fix Windows curl/nghttp2 static build
When curl is linked with a static nghttp2, NGHTTP2_STATICLIB
must be defined.
| -rw-r--r-- | ports/curl/0004_nghttp2_staticlib.patch | 14 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/ports/curl/0004_nghttp2_staticlib.patch b/ports/curl/0004_nghttp2_staticlib.patch new file mode 100644 index 000000000..c5cba9c5f --- /dev/null +++ b/ports/curl/0004_nghttp2_staticlib.patch @@ -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) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index d2a4bee9f..329ead341 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -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) |