From ddcc4ad33450636dc126384c953d8fb03e8d05c2 Mon Sep 17 00:00:00 2001 From: alqaz Date: Fri, 18 May 2018 18:00:09 +0800 Subject: uwebsocket on linux need c++ support (#3455) * uwebsocket on linux need c++ support * [uwebsockets] Compile feature required on all platforms * [libuv] Install pthread-barrier.h --- ports/libuv/CMakeLists.txt | 4 +++- ports/libuv/CONTROL | 2 +- ports/uwebsockets/CMakeLists.txt | 1 + ports/uwebsockets/CONTROL | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt index 2ebc71612..538169e09 100644 --- a/ports/libuv/CMakeLists.txt +++ b/ports/libuv/CMakeLists.txt @@ -61,7 +61,9 @@ if(NOT UV_SKIP_HEADERS) include/uv-win.h include/uv-unix.h include/uv-darwin.h - DESTINATION include) + include/pthread-barrier.h + DESTINATION include +) endif() install(TARGETS libuv diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL index 1c916abe7..6affcb3c2 100644 --- a/ports/libuv/CONTROL +++ b/ports/libuv/CONTROL @@ -1,3 +1,3 @@ Source: libuv -Version: 1.20.3-1 +Version: 1.20.3-2 Description: libuv is a multi-platform support library with a focus on asynchronous I/O. diff --git a/ports/uwebsockets/CMakeLists.txt b/ports/uwebsockets/CMakeLists.txt index 43ccd039c..c3c4f97d8 100644 --- a/ports/uwebsockets/CMakeLists.txt +++ b/ports/uwebsockets/CMakeLists.txt @@ -11,6 +11,7 @@ file(GLOB SOURCES src/*.cpp) add_library(uWS ${SOURCES}) target_include_directories(uWS PUBLIC ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS}) target_link_libraries(uWS PUBLIC ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBUV_LIBRARY}) +target_compile_features(uWS PRIVATE cxx_range_for) install(TARGETS uWS RUNTIME DESTINATION bin diff --git a/ports/uwebsockets/CONTROL b/ports/uwebsockets/CONTROL index 3871e8691..c212611de 100644 --- a/ports/uwebsockets/CONTROL +++ b/ports/uwebsockets/CONTROL @@ -1,4 +1,4 @@ Source: uwebsockets -Version: 0.14.8-1 +Version: 0.14.8-2 Build-Depends: libuv, openssl, zlib Description: Highly scalable cross-platform WebSocket & HTTP library for C++11 and Node.js -- cgit v1.2.3