From e72e80e91035c866b77639d36f02eb8b7f9f8b78 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Thu, 29 Aug 2024 09:35:35 +0200 Subject: [PATCH] cmake: Remove CMake legacy code path --- CMakeLists.txt | 2 - cmake/legacy.cmake | 188 --------------------------------------------- 2 files changed, 190 deletions(-) delete mode 100644 cmake/legacy.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fd515e0..445df657 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,5 @@ cmake_minimum_required(VERSION 3.16...3.25) -legacy_check() - set(obs-websocket_VERSION 5.5.2) set(OBS_WEBSOCKET_RPC_VERSION 1) diff --git a/cmake/legacy.cmake b/cmake/legacy.cmake deleted file mode 100644 index ef87160f..00000000 --- a/cmake/legacy.cmake +++ /dev/null @@ -1,188 +0,0 @@ -project(obs-websocket VERSION 5.5.2) -set(OBS_WEBSOCKET_RPC_VERSION 1) - -option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON) - -add_library(obs-websocket-api INTERFACE) -add_library(OBS::websocket-api ALIAS obs-websocket-api) - -target_sources(obs-websocket-api INTERFACE $ - $) - -target_link_libraries(obs-websocket-api INTERFACE OBS::libobs) - -target_include_directories(obs-websocket-api INTERFACE $ - $) - -set_target_properties(obs-websocket-api PROPERTIES PUBLIC_HEADER lib/obs-websocket-api.h) - -export_target(obs-websocket-api) - -if(NOT ENABLE_WEBSOCKET OR NOT ENABLE_UI) - message(STATUS "OBS: DISABLED obs-websocket") - return() -endif() - -# Plugin tests flag -option(PLUGIN_TESTS "Enable plugin runtime tests" OFF) - -# Find Qt -find_qt(COMPONENTS Core Widgets Svg Network) - -# Find nlohmann JSON -find_package(nlohmann_json 3 REQUIRED) - -# Find qrcodegencpp -set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON) -find_package(qrcodegencpp REQUIRED) -set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF) - -# Find WebSocket++ -find_package(Websocketpp 0.8 REQUIRED) - -# Find Asio -find_package(Asio 1.12.1 REQUIRED) - -# Tell websocketpp not to use system boost -add_definitions(-DASIO_STANDALONE) - -# Configure files -configure_file(src/plugin-macros.h.in plugin-macros.generated.h) - -# Setup target -add_library(obs-websocket MODULE) -add_library(OBS::websocket ALIAS obs-websocket) - -set_target_properties( - obs-websocket - PROPERTIES AUTOMOC ON - AUTOUIC ON - AUTORCC ON) - -if(_QT_VERSION EQUAL 6 AND OS_WINDOWS) - set_target_properties(obs-websocket PROPERTIES AUTORCC_OPTIONS "--format-version;1") -endif() - -target_include_directories(obs-websocket PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - -target_sources( - obs-websocket - PRIVATE src/obs-websocket.cpp - src/obs-websocket.h - src/Config.cpp - src/Config.h - src/forms/SettingsDialog.cpp - src/forms/SettingsDialog.h - src/forms/ConnectInfo.cpp - src/forms/ConnectInfo.h - src/forms/resources.qrc - src/WebSocketApi.cpp - src/WebSocketApi.h - src/websocketserver/WebSocketServer.cpp - src/websocketserver/WebSocketServer_Protocol.cpp - src/websocketserver/WebSocketServer.h - src/websocketserver/rpc/WebSocketSession.h - src/websocketserver/types/WebSocketCloseCode.h - src/websocketserver/types/WebSocketOpCode.h - src/eventhandler/EventHandler.cpp - src/eventhandler/EventHandler_General.cpp - src/eventhandler/EventHandler_Config.cpp - src/eventhandler/EventHandler_Scenes.cpp - src/eventhandler/EventHandler_Inputs.cpp - src/eventhandler/EventHandler_Transitions.cpp - src/eventhandler/EventHandler_Filters.cpp - src/eventhandler/EventHandler_Outputs.cpp - src/eventhandler/EventHandler_SceneItems.cpp - src/eventhandler/EventHandler_MediaInputs.cpp - src/eventhandler/EventHandler_Ui.cpp - src/eventhandler/EventHandler.h - src/eventhandler/types/EventSubscription.h - src/requesthandler/RequestHandler.cpp - src/requesthandler/RequestHandler_General.cpp - src/requesthandler/RequestHandler_Config.cpp - src/requesthandler/RequestHandler_Sources.cpp - src/requesthandler/RequestHandler_Scenes.cpp - src/requesthandler/RequestHandler_Inputs.cpp - src/requesthandler/RequestHandler_Transitions.cpp - src/requesthandler/RequestHandler_Filters.cpp - src/requesthandler/RequestHandler_SceneItems.cpp - src/requesthandler/RequestHandler_Outputs.cpp - src/requesthandler/RequestHandler_Stream.cpp - src/requesthandler/RequestHandler_Record.cpp - src/requesthandler/RequestHandler_MediaInputs.cpp - src/requesthandler/RequestHandler_Ui.cpp - src/requesthandler/RequestHandler.h - src/requesthandler/RequestBatchHandler.cpp - src/requesthandler/RequestBatchHandler.h - src/requesthandler/rpc/Request.cpp - src/requesthandler/rpc/Request.h - src/requesthandler/rpc/RequestBatchRequest.cpp - src/requesthandler/rpc/RequestBatchRequest.h - src/requesthandler/rpc/RequestResult.cpp - src/requesthandler/rpc/RequestResult.h - src/requesthandler/types/RequestStatus.h - src/requesthandler/types/RequestBatchExecutionType.h - src/utils/Crypto.cpp - src/utils/Crypto.h - src/utils/Json.cpp - src/utils/Json.h - src/utils/Obs.cpp - src/utils/Obs_StringHelper.cpp - src/utils/Obs_NumberHelper.cpp - src/utils/Obs_ArrayHelper.cpp - src/utils/Obs_ObjectHelper.cpp - src/utils/Obs_SearchHelper.cpp - src/utils/Obs_ActionHelper.cpp - src/utils/Obs.h - src/utils/Obs_VolumeMeter.cpp - src/utils/Obs_VolumeMeter.h - src/utils/Obs_VolumeMeter_Helpers.h - src/utils/Platform.cpp - src/utils/Platform.h - src/utils/Compat.cpp - src/utils/Compat.h - src/utils/Utils.h) - -target_link_libraries( - obs-websocket - PRIVATE OBS::libobs - OBS::frontend-api - OBS::websocket-api - Qt::Core - Qt::Widgets - Qt::Svg - Qt::Network - nlohmann_json::nlohmann_json - Websocketpp::Websocketpp - Asio::Asio - qrcodegencpp::qrcodegencpp) - -target_compile_features(obs-websocket PRIVATE cxx_std_17) - -set_target_properties(obs-websocket PROPERTIES FOLDER "plugins/obs-websocket") - -if(PLUGIN_TESTS) - target_compile_definitions(obs-websocket PRIVATE PLUGIN_TESTS) -endif() - -# Random other things -if(WIN32) - add_definitions(-D_WEBSOCKETPP_CPP11_STL_) -endif() - -if(MSVC) - target_compile_options(obs-websocket PRIVATE /wd4267 /wd4996) - target_link_options(obs-websocket PRIVATE "LINKER:/IGNORE:4099") -else() - target_compile_options( - obs-websocket - PRIVATE - -Wall - "$<$:-Wno-error=format-overflow>" - "$<$:-Wno-error=null-pointer-subtraction;-Wno-error=deprecated-declarations>" - ) -endif() - -# Final CMake helpers -setup_plugin_target(obs-websocket) -setup_target_resources(obs-websocket "obs-plugins/obs-websocket")