From 6742b7440dcb1daca6366fa788bc9e2f4a403642 Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Fri, 11 Oct 2024 15:33:33 -0400 Subject: [PATCH] UI: Set minimum version for nlohmann_json to 3.11 We know this is the minimum version that we require, so we can just fail during configure if somehow an older version is found. --- UI/cmake/feature-macos-update.cmake | 2 +- UI/cmake/feature-whatsnew.cmake | 2 +- UI/cmake/os-windows.cmake | 2 +- UI/win-update/updater/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UI/cmake/feature-macos-update.cmake b/UI/cmake/feature-macos-update.cmake index 96c860b87dbdd2..7c632779207ce8 100644 --- a/UI/cmake/feature-macos-update.cmake +++ b/UI/cmake/feature-macos-update.cmake @@ -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") diff --git a/UI/cmake/feature-whatsnew.cmake b/UI/cmake/feature-whatsnew.cmake index 4ed3627059cbae..8e6771821ea690 100644 --- a/UI/cmake/feature-whatsnew.cmake +++ b/UI/cmake/feature-whatsnew.cmake @@ -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") diff --git a/UI/cmake/os-windows.cmake b/UI/cmake/os-windows.cmake index 7c3675e94fae07..f781c9db577b97 100644 --- a/UI/cmake/os-windows.cmake +++ b/UI/cmake/os-windows.cmake @@ -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) diff --git a/UI/win-update/updater/CMakeLists.txt b/UI/win-update/updater/CMakeLists.txt index dcd10bb4bdff96..443509ff360d08 100644 --- a/UI/win-update/updater/CMakeLists.txt +++ b/UI/win-update/updater/CMakeLists.txt @@ -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)