fixes and optional websockets

Author: markaren

.github/workflows/config.yml

@@ -76,7 +76,7 @@ jobs:
 
       - name: Configure and build
         run: |
-          cmake . -B build -DSIMPLE_SOCKET_BUILD_TESTS=ON -DSIMPLE_SOCKET_WITH_TLS=OFF -DSIMPLE_SOCKET_WITH_MQTT=OFF -DSIMPLE_SOCKET_WITH_MODBUS=OFF -DSIMPLE_SOCKET_WITH_MEMORY=OFF -DCMAKE_BUILD_TYPE="Release"
+          cmake . -B build -DSIMPLE_SOCKET_BUILD_TESTS=ON -DSIMPLE_SOCKET_WITH_TLS=OFF -DSIMPLE_SOCKET_WITH_MQTT=OFF -DSIMPLE_SOCKET_WITH_MODBUS=OFF -DSIMPLE_SOCKET_WITH_MEMORY=OFF -DSIMPLE_SOCKET_WITH_WEBSOCKETS=OFF -DCMAKE_BUILD_TYPE="Release"
           cmake --build build
 
       - name: Test

CMakeLists.txt

@@ -6,6 +6,7 @@ option(SIMPLE_SOCKET_WITH_TLS "Enable TLS (OpenSSL) for WSS" OFF)
 option(SIMPLE_SOCKET_WITH_MQTT "Enable MQTT support" ON)
 option(SIMPLE_SOCKET_WITH_MODBUS "Enable Modbus support" ON)
 option(SIMPLE_SOCKET_WITH_MEMORY "Enable in-memory transport support" ON)
+option(SIMPLE_SOCKET_WITH_WEBSOCKETS "Enable WebSocket support" ON)
 
 set(CMAKE_CXX_STANDARD 20)
 

src/CMakeLists.txt

@@ -92,6 +92,7 @@ add_library(simple_socket "${publicHeadersFull}" "${privateHeaders}" "${sources}
 target_compile_features(simple_socket PUBLIC "cxx_std_20")
 if (UNIX)
     set_target_properties(simple_socket PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    target_link_libraries(simple_socket PRIVATE pthread)
 endif ()
 if (WIN32)
     target_link_libraries(simple_socket PRIVATE "ws2_32")

tests/CMakeLists.txt

@@ -11,14 +11,16 @@ add_executable(test_un test_un.cpp)
 add_test(NAME test_un COMMAND test_un)
 target_link_libraries(test_un PRIVATE simple_socket Catch2::Catch2WithMain)
 
-add_executable(test_ws test_ws.cpp)
-add_test(NAME test_ws COMMAND test_ws)
-target_link_libraries(test_ws PRIVATE simple_socket Catch2::Catch2WithMain)
-
-if (SIMPLE_SOCKET_WITH_TLS)
-    add_executable(test_wss_client test_wss_client.cpp)
-    add_test(NAME test_wss_client COMMAND test_wss_client)
-    target_link_libraries(test_wss_client PRIVATE simple_socket Catch2::Catch2WithMain)
+if (SIMPLE_SOCKET_WITH_WEBSOCKETS)
+    add_executable(test_ws test_ws.cpp)
+    add_test(NAME test_ws COMMAND test_ws)
+    target_link_libraries(test_ws PRIVATE simple_socket Catch2::Catch2WithMain)
+
+    if (SIMPLE_SOCKET_WITH_TLS)
+        add_executable(test_wss_client test_wss_client.cpp)
+        add_test(NAME test_wss_client COMMAND test_wss_client)
+        target_link_libraries(test_wss_client PRIVATE simple_socket Catch2::Catch2WithMain)
+    endif ()
 endif ()
 
 add_executable(test_conversion test_conversion.cpp)

tests/integration/CMakeLists.txt

@@ -8,20 +8,25 @@ target_link_libraries(run_tcp_server PRIVATE simple_socket)
 add_executable(run_tcp_client run_tcp_client.cpp)
 target_link_libraries(run_tcp_client PRIVATE simple_socket)
 
-add_executable(run_ws run_ws.cpp)
-target_link_libraries(run_ws PRIVATE simple_socket)
+if (SIMPLE_SOCKET_WITH_WEBSOCKETS)
+    add_executable(run_ws run_ws.cpp)
+    target_link_libraries(run_ws PRIVATE simple_socket)
 
-if (SIMPLE_SOCKET_WITH_TLS)
-    add_executable(run_wss run_wss.cpp)
-    target_link_libraries(run_wss PRIVATE simple_socket)
-endif ()
+    if (SIMPLE_SOCKET_WITH_TLS)
+        add_executable(run_wss run_wss.cpp)
+        target_link_libraries(run_wss PRIVATE simple_socket)
+    endif ()
 
-add_executable(memory_server memory_server.cpp)
-target_link_libraries(memory_server PRIVATE simple_socket)
+    file(COPY ws_client.html DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+endif ()
 
-add_executable(memory_client memory_client.cpp)
-target_link_libraries(memory_client PRIVATE simple_socket)
+if (SIMPLE_SOCKET_WITH_MEMORY)
+    add_executable(memory_server memory_server.cpp)
+    target_link_libraries(memory_server PRIVATE simple_socket)
 
+    add_executable(memory_client memory_client.cpp)
+    target_link_libraries(memory_client PRIVATE simple_socket)
+endif ()
 
 if (SIMPLE_SOCKET_WITH_MODBUS)
     add_executable(modbus_client modbus_client.cpp)
@@ -39,11 +44,3 @@ if (SIMPLE_SOCKET_WITH_MQTT)
     target_link_libraries(run_mqtt_client_broker PRIVATE simple_socket)
 endif ()
 
-
-if (UNIX)
-    target_link_libraries(run_tcp_server PRIVATE pthread)
-    target_link_libraries(run_tcp_client PRIVATE pthread)
-    target_link_libraries(run_ws PRIVATE pthread)
-endif ()
-
-file(COPY ws_client.html DESTINATION ${CMAKE_CURRENT_BINARY_DIR})