haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

websocketpp, bump version (#6406)

Browse Source
This commit is contained in:
Schrijvers Luc
2021-11-14 08:39:54 +01:00
committed by GitHub
parent 8e2ca2b801
commit e9989506e8
3 changed files with 90 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
dev-cpp/websocketpp/patches/websocketpp-0.8.2.patchset Normal file
View File

@@ -0,0 +1,88 @@
From 8c7cd84a00e012cca7d7a2ec9559d1f1a7f10a77 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 10 Oct 2021 13:02:34 +0000
Subject: Add Haiku changes (PR upstreamed to develop branch)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f93e24..bbc6d91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,10 +123,14 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
# g++
if (CMAKE_COMPILER_IS_GNUCXX)
- if (NOT APPLE)
+ if (NOT APPLE AND NOT HAIKU)
set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
else()
- set (WEBSOCKETPP_PLATFORM_LIBS pthread)
+ if (HAIKU)
+ set (WEBSOCKETPP_PLATFORM_LIBS pthread network)
+ else()
+ set (WEBSOCKETPP_PLATFORM_LIBS pthread)
+ endif()
endif()
set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
set (WEBSOCKETPP_BOOST_LIBS system thread)
@@ -145,11 +149,15 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
# clang
if (CMAKE_COMPILER_IS_CLANGXX)
- if (NOT APPLE)
+ if (NOT APPLE AND NOT HAIKU)
set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
+ else()
+ if (HAIKU)
+ set (WEBSOCKETPP_PLATFORM_LIBS pthread network)
else()
set (WEBSOCKETPP_PLATFORM_LIBS pthread)
endif()
+ endif()
set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
set (WEBSOCKETPP_BOOST_LIBS system thread)
set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
--
2.30.2
From 8600f4273a8414f072de6fd0d0c34534ad23c198 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 14 Nov 2021 08:30:23 +0000
Subject: Disable tests test_transport and test_transport_asio_timers (known
issues)
diff --git a/test/transport/CMakeLists.txt b/test/transport/CMakeLists.txt
index 6b44d98..e54885a 100644
--- a/test/transport/CMakeLists.txt
+++ b/test/transport/CMakeLists.txt
@@ -1,25 +1,5 @@
if (OPENSSL_FOUND)
-# Test transport integration
-file (GLOB SOURCE integration.cpp)
-
-init_target (test_transport)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_openssl()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport asio timers
-file (GLOB SOURCE asio/timers.cpp)
-
-init_target (test_transport_asio_timers)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_openssl()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
# Test transport asio security
file (GLOB SOURCE asio/security.cpp)
--
2.30.2