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.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
...
compare: Mirrored_Repos:5.3.2
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

2 Commits
5.3.1 ... 5.3.2

Author SHA1 Message Date
Ryan Foster
08767ae5a7 base: Update version to 5.3.2 
- Fix plugin tests being enabled by default
 2023-10-09 16:34:30 -04:00
Ryan Foster
16bf61aab6 cmake: Fix condition to disable plugin tests 
The CMake generator expression to enable plugin tests mistakenly used a
string literal, which evaluated to 1, which enabled the plugin tests by
default. Use variable notation to correctly test this value.
 2023-10-02 14:37:04 -07:00
2 changed files with 3 additions and 3 deletions
Expand all files Collapse all files

4
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.1) set(obs-websocket_VERSION 5.3.2)
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)
@ -128,7 +128,7 @@ configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
target_sources(obs-websocket PRIVATE plugin-macros.generated.h) target_sources(obs-websocket PRIVATE plugin-macros.generated.h)
target_compile_definitions( target_compile_definitions(
obs-websocket PRIVATE ASIO_STANDALONE $<$<BOOL:PLUGIN_TESTS>:PLUGIN_TESTS> obs-websocket PRIVATE ASIO_STANDALONE $<$<BOOL:${PLUGIN_TESTS}>:PLUGIN_TESTS>
$<$<PLATFORM_ID:Windows>:_WEBSOCKETPP_CPP11_STL_> $<$<PLATFORM_ID:Windows>:_WIN32_WINNT=0x0603>) $<$<PLATFORM_ID:Windows>:_WEBSOCKETPP_CPP11_STL_> $<$<PLATFORM_ID:Windows>:_WIN32_WINNT=0x0603>)
target_compile_options( target_compile_options(

2
cmake/legacy.cmake
View File

@ -1,4 +1,4 @@
project(obs-websocket VERSION 5.3.1) project(obs-websocket VERSION 5.3.2)
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)