diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-07 17:18:24 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-07 17:18:41 -0800 |
| commit | 50162c75426144944888b7a24a28705feaaaebd6 (patch) | |
| tree | 67502a63d6f0fac5d0c090c957b69c6818b52376 | |
| parent | addf31613eed32f24a17689d2c07d1fff647e761 (diff) | |
| download | vcpkg-50162c75426144944888b7a24a28705feaaaebd6.tar.gz vcpkg-50162c75426144944888b7a24a28705feaaaebd6.zip | |
[uwebsockets] Update to v0.13.0. Resolves #738
| -rw-r--r-- | ports/uwebsockets/0001_cmake.patch | 25 | ||||
| -rw-r--r-- | ports/uwebsockets/portfile.cmake | 9 |
2 files changed, 18 insertions, 16 deletions
diff --git a/ports/uwebsockets/0001_cmake.patch b/ports/uwebsockets/0001_cmake.patch index f4004a5bb..f0879d659 100644 --- a/ports/uwebsockets/0001_cmake.patch +++ b/ports/uwebsockets/0001_cmake.patch @@ -1,22 +1,24 @@ +commit 2b244f92ddf5e58bf81ccb40a8f23a3f94d9941b +Author: Alexander Karatarakis <alkarata@microsoft.com> +Date: Tue Mar 7 17:13:52 2017 -0800 + + Fixes + diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fadf72..6ee984d 100644 +index 33a8ae0..0b9c006 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -18,7 +18,11 @@ if(NOT LIBUV_INCLUDE_DIR) +@@ -12,7 +12,7 @@ if(NOT LIBUV_INCLUDE_DIR) find_path(LIBUV_INCLUDE_DIR uv.h) endif() if(NOT LIBUV_LIBRARY) - find_library(LIBUV_LIBRARY NAMES uv uv1) -+ if(WIN32) -+ find_library(LIBUV_LIBRARY NAMES libuv) -+ else() -+ find_library(LIBUV_LIBRARY NAMES uv uv1) -+ endif() ++ find_library(LIBUV_LIBRARY NAMES libuv uv uv1) endif() - add_library(uWS src/Extensions.cpp src/Group.cpp src/WebSocketImpl.cpp src/Networking.cpp src/Hub.cpp src/Node.cpp src/WebSocket.cpp src/HTTPSocket.cpp src/Socket.cpp) -@@ -38,4 +42,20 @@ install (TARGETS uWS DESTINATION /usr/lib64) - install (FILES src/Extensions.h src/WebSocketProtocol.h src/Networking.h src/WebSocket.h src/Hub.h src/Group.h src/Node.h src/Socket.h src/HTTPSocket.h src/uWS.h DESTINATION /usr/include/uWS) + add_library(uWS src/Extensions.cpp src/Group.cpp src/WebSocketImpl.cpp src/Networking.cpp src/Hub.cpp src/Node.cpp src/WebSocket.cpp src/HTTPSocket.cpp src/Socket.cpp src/uUV.cpp) +@@ -38,4 +38,20 @@ install (TARGETS uWS DESTINATION /usr/lib64) + install (FILES src/Extensions.h src/WebSocketProtocol.h src/Networking.h src/WebSocket.h src/Hub.h src/Group.h src/Node.h src/Socket.h src/HTTPSocket.h src/uWS.h src/uUV.h DESTINATION /usr/include/uWS) endif (UNIX) -add_subdirectory(examples) @@ -25,7 +27,7 @@ index 1fadf72..6ee984d 100644 +if(WIN32) + target_link_libraries (uWS PUBLIC psapi.lib iphlpapi.lib userenv.lib) + install (FILES src/Extensions.h src/WebSocketProtocol.h src/Networking.h src/WebSocket.h src/Hub.h src/Group.h src/Node.h src/Socket.h src/HTTPSocket.h src/uWS.h DESTINATION include/uWS) -+ ++ + if(BUILD_SHARED_LIBS) + target_link_libraries (uWS PUBLIC ws2_32.lib) + endif() @@ -37,4 +39,3 @@ index 1fadf72..6ee984d 100644 + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) -\ No newline at end of file
\ No newline at end of file diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 881f35086..1049e761d 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -1,9 +1,10 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/uwebsockets-0.12.0) +set(VERSION 0.13.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/uwebsockets-${VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/uWebSockets/uWebSockets/archive/v0.12.0.zip" - FILENAME "uwebsockets-v0.12.0.zip" - SHA512 ea10682608d5f6c8b246f186dfc2f14f496858cc7e468880b96b111f10058daf529f1aa9662a851e21494dde9a4faadf2b9904483dac5350d0ca8736500cdda8 + URLS "https://github.com/uWebSockets/uWebSockets/archive/v${VERSION}.zip" + FILENAME "uwebsockets-v${VERSION}.zip" + SHA512 d3912296ed9e20900dc401e841238b84fe273e2e828500347d311948b8cb9dc3a08039b87f82d32a5844e39782201fe39641f336040a4a0493787760f1b5c618 ) vcpkg_extract_source_archive(${ARCHIVE}) |