Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

base,deps,src: Replace qr submodule by prefix/system install

Browse Source
This commit is contained in:
tytan652 2023-04-20 14:48:06 +02:00 committed by tt2468
parent 93713c438e
commit 417725801c
5 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "deps/qr"]
path = deps/qr
url = https://github.com/nayuki/QR-Code-generator.git

13
CMakeLists.txt
View File

@ -11,17 +11,15 @@ if(NOT ENABLE_WEBSOCKET)
return()
endif()
# Submodule deps check
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp")
message(FATAL_ERROR "obs-websocket submodule deps not available.")
endif()
# Find Qt
find_qt(COMPONENTS Core Widgets Svg Network)
# Find nlohmann JSON
find_package(nlohmann_json 3 REQUIRED)
# Find qrcodegencpp
find_package(Libqrcodegencpp REQUIRED)
# Find WebSocket++
find_package(Websocketpp 0.8 REQUIRED)
@ -124,8 +122,6 @@ target_sources(
src/utils/Platform.h
src/utils/Utils.h)
target_sources(obs-websocket PRIVATE deps/qr/cpp/QrCode.cpp deps/qr/cpp/QrCode.hpp)
configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
target_sources(obs-websocket PRIVATE plugin-macros.generated.h)
@ -154,7 +150,8 @@ target_link_libraries(
Qt::Network
nlohmann_json::nlohmann_json
Websocketpp::Websocketpp
Asio::Asio)
Asio::Asio
Libqrcodegencpp::Libqrcodegencpp)
set_target_properties_obs(
obs-websocket

15
cmake/legacy.cmake
View File

@ -8,11 +8,6 @@ if(NOT ENABLE_WEBSOCKET OR NOT ENABLE_UI)
return()
endif()
# Submodule deps check
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp)
obs_status(FATAL_ERROR "obs-websocket submodule deps not available.")
endif()
# Plugin tests flag
option(PLUGIN_TESTS "Enable plugin runtime tests" OFF)
@ -22,6 +17,9 @@ find_qt(COMPONENTS Core Widgets Svg Network)
# Find nlohmann JSON
find_package(nlohmann_json 3 REQUIRED)
# Find qrcodegencpp
find_package(Libqrcodegencpp REQUIRED)
# Find WebSocket++
find_package(Websocketpp 0.8 REQUIRED)
@ -127,9 +125,7 @@ target_sources(
src/utils/Platform.h
src/utils/Compat.cpp
src/utils/Compat.h
src/utils/Utils.h
deps/qr/cpp/QrCode.cpp
deps/qr/cpp/QrCode.hpp)
src/utils/Utils.h)
target_link_libraries(
obs-websocket
@ -141,7 +137,8 @@ target_link_libraries(
Qt::Network
nlohmann_json::nlohmann_json
Websocketpp::Websocketpp
Asio::Asio)
Asio::Asio
Libqrcodegencpp::Libqrcodegencpp)
target_compile_features(obs-websocket PRIVATE cxx_std_17)

1
deps/qr vendored

@ -1 +0,0 @@
Subproject commit 8518684c0f33d004fa93971be2c6a8eca3167d1e

2
src/forms/ConnectInfo.cpp
View File

@ -21,9 +21,9 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#include <QPainter>
#include <QUrl>
#include <obs-module.h>
#include <qrcodegen.hpp>
#include "ConnectInfo.h"
#include "../../deps/qr/cpp/QrCode.hpp"
#include "../obs-websocket.h"
#include "../Config.h"
#include "../utils/Platform.h"