websocketpp-0.8.1.patchset revision 969733fa
1From 8b262621b4de9546744e187bfcd978067687c80f Mon Sep 17 00:00:00 2001
2From: begasus <begasus@gmail.com>
3Date: Sat, 14 Sep 2019 10:27:13 +0200
4Subject: Set correct path for $includeDir (merged upstream)
5
6
7diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake
8index 1478f4b..f603632 100644
9--- a/cmake/CMakeHelpers.cmake
10+++ b/cmake/CMakeHelpers.cmake
11@@ -80,7 +80,7 @@ macro (final_target)
12     endif ()
13 
14     install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME}
15-             DESTINATION include/
16+             DESTINATION ${INSTALL_INCLUDE_DIR}/
17              FILES_MATCHING PATTERN "*.hpp*")
18 endmacro ()
19 
20-- 
212.24.0
22
23
24From 96ca41275f85a4c1d6a8e18066462d89f4a09428 Mon Sep 17 00:00:00 2001
25From: begasus <begasus@gmail.com>
26Date: Sat, 14 Sep 2019 14:38:58 +0200
27Subject: Update version number in CMakeList.txt (import merged PR)
28
29
30diff --git a/CMakeLists.txt b/CMakeLists.txt
31index 2786aba..2d13117 100644
32--- a/CMakeLists.txt
33+++ b/CMakeLists.txt
34@@ -24,7 +24,7 @@ endif ()
35 ############ Project name and version
36 set (WEBSOCKETPP_MAJOR_VERSION 0)
37 set (WEBSOCKETPP_MINOR_VERSION 8)
38-set (WEBSOCKETPP_PATCH_VERSION 0)
39+set (WEBSOCKETPP_PATCH_VERSION 1)
40 set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
41 
42 if(POLICY CMP0048)
43-- 
442.24.0
45
46
47From a856149c76031db2e54e540a9b46eb8157fbe16c Mon Sep 17 00:00:00 2001
48From: begasus <begasus@gmail.com>
49Date: Sat, 28 Sep 2019 08:08:30 +0200
50Subject: Add Haiku changes (PR upstreamed)
51
52
53diff --git a/CMakeLists.txt b/CMakeLists.txt
54index 2d13117..413935c 100644
55--- a/CMakeLists.txt
56+++ b/CMakeLists.txt
57@@ -123,7 +123,15 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
58 
59     # g++
60     if (CMAKE_COMPILER_IS_GNUCXX)
61+        if (NOT APPLE AND NOT HAIKU)
62         set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
63+        else()
64+        if (HAIKU)
65+        set (WEBSOCKETPP_PLATFORM_LIBS pthread network)
66+        else()
67+        set (WEBSOCKETPP_PLATFORM_LIBS pthread)
68+        endif()
69+        endif()
70         set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
71         set (WEBSOCKETPP_BOOST_LIBS system thread)
72         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
73@@ -141,11 +149,15 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
74 
75     # clang
76     if (CMAKE_COMPILER_IS_CLANGXX)
77-        if (NOT APPLE)
78+        if (NOT APPLE AND NOT HAIKU)
79             set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
80+        else()
81+        if (HAIKU)
82+        set (WEBSOCKETPP_PLATFORM_LIBS pthread network)
83         else()
84             set (WEBSOCKETPP_PLATFORM_LIBS pthread)
85         endif()
86+        endif()
87         set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
88         set (WEBSOCKETPP_BOOST_LIBS system thread)
89         set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
90@@ -202,7 +214,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
91 	endif ()
92 
93     if (NOT Boost_USE_STATIC_LIBS)
94-        add_definitions (/DBOOST_TEST_DYN_LINK)
95+        add_definitions (-DBOOST_TEST_DYN_LINK)
96     endif ()
97 
98     set (Boost_FIND_REQUIRED TRUE)
99-- 
1002.24.0
101
102
103From fc459b5f1637c1394bb49e31268a1dddb15d350e Mon Sep 17 00:00:00 2001
104From: begasus <begasus@gmail.com>
105Date: Mon, 18 Nov 2019 08:32:36 +0100
106Subject: Disable tests test_transport and test_transport_asio_timers (known issues)
107
108
109diff --git a/test/transport/CMakeLists.txt b/test/transport/CMakeLists.txt
110index 6b44d98..e54885a 100644
111--- a/test/transport/CMakeLists.txt
112+++ b/test/transport/CMakeLists.txt
113@@ -1,25 +1,5 @@
114 if (OPENSSL_FOUND)
115 
116-# Test transport integration
117-file (GLOB SOURCE integration.cpp)
118-
119-init_target (test_transport)
120-build_test (${TARGET_NAME} ${SOURCE})
121-link_boost ()
122-link_openssl()
123-final_target ()
124-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
125-
126-# Test transport asio timers
127-file (GLOB SOURCE asio/timers.cpp)
128-
129-init_target (test_transport_asio_timers)
130-build_test (${TARGET_NAME} ${SOURCE})
131-link_boost ()
132-link_openssl()
133-final_target ()
134-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
135-
136 # Test transport asio security
137 file (GLOB SOURCE asio/security.cpp)
138 
139-- 
1402.24.0
141
142