mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-27 10:52:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Set minimum version for nlohmann_json to 3.11

Browse Source 
We know this is the minimum version that we require, so we can just fail
during configure if somehow an older version is found.
This commit is contained in:
Ryan Foster
2024-10-11 15:33:33 -04:00
parent ba6a6bfdcb
commit 77d74dd0da
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UI/cmake/feature-macos-update.cmake
View File

@@ -1,6 +1,6 @@
include_guard(DIRECTORY)
find_package(nlohmann_json REQUIRED)
find_package(nlohmann_json 3.11 REQUIRED)
if(NOT TARGET OBS::blake2)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/blake2" "${CMAKE_BINARY_DIR}/deps/blake2")

2
UI/cmake/feature-whatsnew.cmake
View File

@@ -9,7 +9,7 @@ if(ENABLE_WHATSNEW AND TARGET OBS::browser-panels)
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
find_package(MbedTLS REQUIRED)
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG FALSE)
find_package(nlohmann_json REQUIRED)
find_package(nlohmann_json 3.11 REQUIRED)
if(NOT TARGET OBS::blake2)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/blake2" "${CMAKE_BINARY_DIR}/deps/blake2")

2
UI/cmake/os-windows.cmake
View File

@@ -10,7 +10,7 @@ set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
find_package(MbedTLS REQUIRED)
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG FALSE)
find_package(Detours REQUIRED)
find_package(nlohmann_json REQUIRED)
find_package(nlohmann_json 3.11 REQUIRED)
configure_file(cmake/windows/obs.rc.in obs.rc)

2
UI/win-update/updater/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.28...3.30)
find_package(zstd)
find_package(nlohmann_json 3 REQUIRED)
find_package(nlohmann_json 3.11 REQUIRED)
add_executable(updater WIN32)