Replace obs-websocket-api copy with CMake target

obsproject · Oct 17, 2024 · fc946f2 · fc946f2
1 parent 941c48b
commit fc946f2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 141 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,6 @@ target_sources(
           cef-headers.hpp
           deps/base64/base64.cpp
           deps/base64/base64.hpp
-          deps/obs-websocket-api/obs-websocket-api.h
           deps/signal-restore.cpp
           deps/signal-restore.hpp
           deps/wide-string.cpp
@@ -44,7 +43,7 @@ target_sources(
 target_include_directories(obs-browser PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps")
 
 target_compile_features(obs-browser PRIVATE cxx_std_17)
-target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api nlohmann_json::nlohmann_json)
+target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api OBS::websocket-api nlohmann_json::nlohmann_json)
 
 if(OS_WINDOWS)
   include(cmake/os-windows.cmake)

diff --git a/deps/obs-websocket-api/.clang-format b/deps/obs-websocket-api/.clang-format
diff --git a/deps/obs-websocket-api/obs-websocket-api.h b/deps/obs-websocket-api/obs-websocket-api.h
diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp
@@ -28,13 +28,13 @@
 #include <thread>
 #include <mutex>
 #include <nlohmann/json.hpp>
+#include <obs-websocket-api.h>
 
 #include "obs-browser-source.hpp"
 #include "browser-scheme.hpp"
 #include "browser-app.hpp"
 #include "browser-version.h"
 
-#include "obs-websocket-api/obs-websocket-api.h"
 #include "cef-headers.hpp"
 
 #ifdef _WIN32