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

Compare commits

base: Mirrored_Repos:5.3.0
Branches Tags
Mirrored_Repos:master Mirrored_Repos:experimental-batch-logic Mirrored_Repos:release/5.2.3 Mirrored_Repos:4.x-compat-new-cmake Mirrored_Repos:4.x-compat Mirrored_Repos:release/5.0.0
Mirrored_Repos:5.5.2 Mirrored_Repos:5.5.1 Mirrored_Repos:5.5.0 Mirrored_Repos:5.4.2 Mirrored_Repos:5.4.1 Mirrored_Repos:5.4.0 Mirrored_Repos:5.3.5 Mirrored_Repos:5.3.4 Mirrored_Repos:5.3.3 Mirrored_Repos:5.3.2 Mirrored_Repos:5.3.1 Mirrored_Repos:5.3.0 Mirrored_Repos:5.2.3 Mirrored_Repos:5.2.2 Mirrored_Repos:5.2.1 Mirrored_Repos:5.2.0 Mirrored_Repos:5.1.0 Mirrored_Repos:5.0.2 Mirrored_Repos:4.9.1-compat Mirrored_Repos:5.0.1 Mirrored_Repos:5.0.0 Mirrored_Repos:5.0.0-beta1 Mirrored_Repos:5.0.0-notarize-test Mirrored_Repos:5.0.0-alpha3 Mirrored_Repos:5.0.0-alpha2 Mirrored_Repos:5.0.0-alpha1 Mirrored_Repos:4.9.1 Mirrored_Repos:4.9.0 Mirrored_Repos:4.8.0 Mirrored_Repos:4.7.0 Mirrored_Repos:4.6.1 Mirrored_Repos:4.6.0 Mirrored_Repos:4.5.1 Mirrored_Repos:4.5.0 Mirrored_Repos:4.4.0 Mirrored_Repos:4.3.3 Mirrored_Repos:4.3.2 Mirrored_Repos:4.3.1 Mirrored_Repos:4.3.0 Mirrored_Repos:4.2.0 Mirrored_Repos:4.1.0 Mirrored_Repos:4.0.0 Mirrored_Repos:0.3.2 Mirrored_Repos:0.3.1 Mirrored_Repos:0.3-alpha
...
compare: Mirrored_Repos:5.3.1
Branches Tags
Mirrored_Repos:master Mirrored_Repos:experimental-batch-logic Mirrored_Repos:release/5.2.3 Mirrored_Repos:4.x-compat-new-cmake Mirrored_Repos:4.x-compat Mirrored_Repos:release/5.0.0
Mirrored_Repos:5.5.2 Mirrored_Repos:5.5.1 Mirrored_Repos:5.5.0 Mirrored_Repos:5.4.2 Mirrored_Repos:5.4.1 Mirrored_Repos:5.4.0 Mirrored_Repos:5.3.5 Mirrored_Repos:5.3.4 Mirrored_Repos:5.3.3 Mirrored_Repos:5.3.2 Mirrored_Repos:5.3.1 Mirrored_Repos:5.3.0 Mirrored_Repos:5.2.3 Mirrored_Repos:5.2.2 Mirrored_Repos:5.2.1 Mirrored_Repos:5.2.0 Mirrored_Repos:5.1.0 Mirrored_Repos:5.0.2 Mirrored_Repos:4.9.1-compat Mirrored_Repos:5.0.1 Mirrored_Repos:5.0.0 Mirrored_Repos:5.0.0-beta1 Mirrored_Repos:5.0.0-notarize-test Mirrored_Repos:5.0.0-alpha3 Mirrored_Repos:5.0.0-alpha2 Mirrored_Repos:5.0.0-alpha1 Mirrored_Repos:4.9.1 Mirrored_Repos:4.9.0 Mirrored_Repos:4.8.0 Mirrored_Repos:4.7.0 Mirrored_Repos:4.6.1 Mirrored_Repos:4.6.0 Mirrored_Repos:4.5.1 Mirrored_Repos:4.5.0 Mirrored_Repos:4.4.0 Mirrored_Repos:4.3.3 Mirrored_Repos:4.3.2 Mirrored_Repos:4.3.1 Mirrored_Repos:4.3.0 Mirrored_Repos:4.2.0 Mirrored_Repos:4.1.0 Mirrored_Repos:4.0.0 Mirrored_Repos:0.3.2 Mirrored_Repos:0.3.1 Mirrored_Repos:0.3-alpha

4 Commits
5.3.0 ... 5.3.1

Author SHA1 Message Date
Ryan Foster
e9c0eee9e4 base: Update version to 5.3.1 
- Fix issues with qrcodegencpp CMake preventing Debug builds
 2023-09-19 13:21:47 -04:00
Ryan Foster
f4a3de575c cmake: Update library and target names for qrcodegen 
qrcodegen is identified as such (without the "lib" prefix) and as the
target "qrcodegencpp::qrcodegencpp" by the CMake package generated by
obs-deps and the finders in obs-studio when using module fallback.
 2023-09-19 13:13:57 -04:00
Ryan Foster
2bfa1b4c64 cmake: Ignore LNK4099 warning 
Despite building the PDBs for qrcodegencpp debug builds, we do not
currently ship those PDBs, so MSVC emits an LNK4099 warning, which
causes a build failure. It's unlikely that we'll need to debug in linked
dependencies, so we can ignore this warning. Should we decide in the
future to ship PDBs for these dependencies, the warning would no longer
be emitted, and this flag would be superfluous without requiring a
change. For now, let's make sure we can build in Debug.
 2023-09-19 10:52:15 -04:00
PatTheMav
0e611f579b cmake: Update library and target names for qrcodegen 
qrcodegen is identified as such (without the "lib" prefix) and as the
target "qrcodegencpp::qrcodegencpp" by the CMake package generated by
obs-deps.
 2023-09-18 12:50:40 -04:00
2 changed files with 13 additions and 6 deletions
Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16...3.25)
legacy_check() legacy_check()
set(obs-websocket_VERSION 5.3.0) set(obs-websocket_VERSION 5.3.1)
set(OBS_WEBSOCKET_RPC_VERSION 1) set(OBS_WEBSOCKET_RPC_VERSION 1)
option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON) option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
@ -18,7 +18,9 @@ find_qt(COMPONENTS Core Widgets Svg Network)
find_package(nlohmann_json 3 REQUIRED) find_package(nlohmann_json 3 REQUIRED)
# Find qrcodegencpp # Find qrcodegencpp
find_package(Libqrcodegencpp REQUIRED) set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
find_package(qrcodegencpp REQUIRED)
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
# Find WebSocket++ # Find WebSocket++
find_package(Websocketpp 0.8 REQUIRED) find_package(Websocketpp 0.8 REQUIRED)
@ -151,7 +153,7 @@ target_link_libraries(
nlohmann_json::nlohmann_json nlohmann_json::nlohmann_json
Websocketpp::Websocketpp Websocketpp::Websocketpp
Asio::Asio Asio::Asio
Libqrcodegencpp::Libqrcodegencpp) qrcodegencpp::qrcodegencpp)
set_target_properties_obs( set_target_properties_obs(
obs-websocket obs-websocket
@ -166,4 +168,6 @@ if(OS_WINDOWS)
TARGET obs-websocket TARGET obs-websocket
APPEND APPEND
PROPERTY AUTORCC_OPTIONS --format-version 1) PROPERTY AUTORCC_OPTIONS --format-version 1)
target_link_options(obs-websocket PRIVATE /IGNORE:4099)
endif() endif()

9
cmake/legacy.cmake
View File

@ -1,4 +1,4 @@
project(obs-websocket VERSION 5.3.0) project(obs-websocket VERSION 5.3.1)
set(OBS_WEBSOCKET_RPC_VERSION 1) set(OBS_WEBSOCKET_RPC_VERSION 1)
option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON) option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
@ -18,7 +18,9 @@ find_qt(COMPONENTS Core Widgets Svg Network)
find_package(nlohmann_json 3 REQUIRED) find_package(nlohmann_json 3 REQUIRED)
# Find qrcodegencpp # Find qrcodegencpp
find_package(Libqrcodegencpp REQUIRED) set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
find_package(qrcodegencpp REQUIRED)
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
# Find WebSocket++ # Find WebSocket++
find_package(Websocketpp 0.8 REQUIRED) find_package(Websocketpp 0.8 REQUIRED)
@ -138,7 +140,7 @@ target_link_libraries(
nlohmann_json::nlohmann_json nlohmann_json::nlohmann_json
Websocketpp::Websocketpp Websocketpp::Websocketpp
Asio::Asio Asio::Asio
Libqrcodegencpp::Libqrcodegencpp) qrcodegencpp::qrcodegencpp)
target_compile_features(obs-websocket PRIVATE cxx_std_17) target_compile_features(obs-websocket PRIVATE cxx_std_17)
@ -155,6 +157,7 @@ endif()
if(MSVC) if(MSVC)
target_compile_options(obs-websocket PRIVATE /wd4267 /wd4996) target_compile_options(obs-websocket PRIVATE /wd4267 /wd4996)
target_link_options(obs-websocket PRIVATE "LINKER:/IGNORE:4099")
else() else()
target_compile_options( target_compile_options(
obs-websocket obs-websocket