diff options
| author | Shuanglei Tao <tsl0922@gmail.com> | 2020-02-14 11:04:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 19:04:40 -0800 |
| commit | bc37190216256125bc7227456d5983809fec7373 (patch) | |
| tree | 44cdcf23f9813c9d91c3d2dbd5b526f80d2f1515 | |
| parent | 90114a0e2ecfc983d496720debbfec3a4c4d84ac (diff) | |
| download | vcpkg-bc37190216256125bc7227456d5983809fec7373.tar.gz vcpkg-bc37190216256125bc7227456d5983809fec7373.zip | |
[libwebsockets] add libuv support (#9970)
* [libwebsockets] add libuv support
* [libwebsockets] Bump control version
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/libwebsockets/CMakeLists.patch | 15 | ||||
| -rw-r--r-- | ports/libwebsockets/CONTROL | 4 | ||||
| -rw-r--r-- | ports/libwebsockets/portfile.cmake | 3 |
3 files changed, 15 insertions, 7 deletions
diff --git a/ports/libwebsockets/CMakeLists.patch b/ports/libwebsockets/CMakeLists.patch index c2263f709..035b69d66 100644 --- a/ports/libwebsockets/CMakeLists.patch +++ b/ports/libwebsockets/CMakeLists.patch @@ -1,8 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4daeec85e..34e5e197d 100644 ---- a/CMakeLists.txt +index 7772ed0..656e5a0 100644 +--- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1822,7 +1822,7 @@ endif() +@@ -1767,7 +1767,7 @@ endif(LWS_WITH_LIBEV) + if (LWS_WITH_LIBUV) + if (NOT LIBUV_FOUND) + find_path(LIBUV_INCLUDE_DIRS NAMES uv.h) +- find_library(LIBUV_LIBRARIES NAMES uv) ++ find_library(LIBUV_LIBRARIES NAMES uv libuv) + if(LIBUV_INCLUDE_DIRS AND LIBUV_LIBRARIES) + set(LIBUV_FOUND 1) + endif() +@@ -1826,7 +1826,7 @@ endif() if (WINCE) list(APPEND LIB_LIST ws2.lib) elseif (WIN32) diff --git a/ports/libwebsockets/CONTROL b/ports/libwebsockets/CONTROL index e6f9a9cb8..77536b9f8 100644 --- a/ports/libwebsockets/CONTROL +++ b/ports/libwebsockets/CONTROL @@ -1,5 +1,5 @@ Source: libwebsockets -Version: 3.2.2 -Build-Depends: zlib, openssl +Version: 3.2.2-1 +Build-Depends: zlib, openssl, libuv 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 fe979df59..a05ce4b16 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO warmcat/libwebsockets @@ -141,6 +139,7 @@ vcpkg_configure_cmake( -DLWS_IPV6=ON -DLWS_HTTP2=ON -DLWS_WITH_HTTP_STREAM_COMPRESSION=ON # Since zlib is already a dependency + -DLWS_WITH_LIBUV=ON # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) |