aboutsummaryrefslogtreecommitdiff
path: root/ports/libwebsockets
diff options
context:
space:
mode:
authorCurtis J Bezault <curtbezault@gmail.com>2019-08-09 11:59:32 -0400
committerGitHub <noreply@github.com>2019-08-09 11:59:32 -0400
commitc4f1a91ef245ed3e44ea11f13040a77453126165 (patch)
tree3e6c99d970fe8a5fcd1551bbcbf9fde4f0b0a3a4 /ports/libwebsockets
parent9da7c5c99ee42e382895dbd0dafdd29beaa61075 (diff)
parent743e168ef5c7705e44d1d5cab5b9cca22328345e (diff)
downloadvcpkg-c4f1a91ef245ed3e44ea11f13040a77453126165.tar.gz
vcpkg-c4f1a91ef245ed3e44ea11f13040a77453126165.zip
Merge branch 'master' into external_file_abi
Diffstat (limited to 'ports/libwebsockets')
-rw-r--r--ports/libwebsockets/CONTROL2
-rw-r--r--ports/libwebsockets/portfile.cmake1
2 files changed, 2 insertions, 1 deletions
diff --git a/ports/libwebsockets/CONTROL b/ports/libwebsockets/CONTROL
index 1b091480a..a180ec420 100644
--- a/ports/libwebsockets/CONTROL
+++ b/ports/libwebsockets/CONTROL
@@ -1,5 +1,5 @@
Source: libwebsockets
-Version: 3.1.0-2
+Version: 3.1.0-3
Build-Depends: zlib, openssl
Homepage: https://github.com/warmcat/libwebsockets
Description: Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.
diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake
index b2b90cccf..06793dd8e 100644
--- a/ports/libwebsockets/portfile.cmake
+++ b/ports/libwebsockets/portfile.cmake
@@ -13,6 +13,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LWS_WITH_SHARED)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
OPTIONS
-DLWS_WITH_STATIC=${LWS_WITH_STATIC}
-DLWS_WITH_SHARED=${LWS_WITH_SHARED}