1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?=
<umlaeute@debian.org>
Date: Fri, 23 Sep 2022 20:40:26 +0200
Subject: Use system-libraries when building obs-websocket
Origin: Debian
Forwarded: not-needed
Last-Update: 2022-09-20
---
websocket/CMakeLists.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/websocket/CMakeLists.txt b/websocket/CMakeLists.txt
index a900288..e5023fd 100644
--- a/websocket/CMakeLists.txt
+++ b/websocket/CMakeLists.txt
@@ -14,7 +14,7 @@ if(NOT
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/websocketpp/CMakeLists.txt
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include/asio.hpp))
- obs_status(FATAL_ERROR "obs-websocket submodule deps not available.")
+ obs_status(INFO "obs-websocket submodule deps not available.")
endif()
# Plugin tests flag
@@ -34,7 +34,6 @@ find_qt(COMPONENTS Core Widgets Svg Network)
set(JSON_BuildTests
OFF
CACHE INTERNAL "")
-add_subdirectory(deps/json)
# Tell websocketpp not to use system boost
add_definitions(-DASIO_STANDALONE)
@@ -142,7 +141,7 @@ target_link_libraries(
Qt::Widgets
Qt::Svg
Qt::Network
- nlohmann_json::nlohmann_json)
+ )
target_compile_features(obs-websocket PRIVATE cxx_std_17)
|
