base: Update version to 5.3.2

- Fix plugin tests being enabled by default
cmake: Fix condition to disable plugin tests
2024-08-30 18:12:16 +00:00 · 2023-10-09 16:34:30 -04:00 · 2023-10-02 14:37:04 -07:00 · 2023-09-19 13:21:47 -04:00 · 2023-09-19 13:13:57 -04:00 · 2023-09-19 10:52:15 -04:00
2 changed files with 14 additions and 7 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16...3.25)

 legacy_check()

-set(obs-websocket_VERSION 5.3.0)
+set(obs-websocket_VERSION 5.3.2)
 set(OBS_WEBSOCKET_RPC_VERSION 1)

 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 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_package(Websocketpp 0.8 REQUIRED)
@ -126,7 +128,7 @@ configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
 target_sources(obs-websocket PRIVATE plugin-macros.generated.h)

 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>)

 target_compile_options(
@ -151,7 +153,7 @@ target_link_libraries(
          nlohmann_json::nlohmann_json
          Websocketpp::Websocketpp
          Asio::Asio
-          Libqrcodegencpp::Libqrcodegencpp)
+          qrcodegencpp::qrcodegencpp)

 set_target_properties_obs(
  obs-websocket
@ -166,4 +168,6 @@ if(OS_WINDOWS)
    TARGET obs-websocket
    APPEND
    PROPERTY AUTORCC_OPTIONS --format-version 1)
+
+  target_link_options(obs-websocket PRIVATE /IGNORE:4099)
 endif()
--- a/cmake/legacy.cmake
+++ b/cmake/legacy.cmake
@ -1,4 +1,4 @@
-project(obs-websocket VERSION 5.3.0)
+project(obs-websocket VERSION 5.3.2)
 set(OBS_WEBSOCKET_RPC_VERSION 1)

 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 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_package(Websocketpp 0.8 REQUIRED)
@ -138,7 +140,7 @@ target_link_libraries(
          nlohmann_json::nlohmann_json
          Websocketpp::Websocketpp
          Asio::Asio
-          Libqrcodegencpp::Libqrcodegencpp)
+          qrcodegencpp::qrcodegencpp)

 target_compile_features(obs-websocket PRIVATE cxx_std_17)

@ -155,6 +157,7 @@ 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
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
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