From 71ef44f06ea8ccbf3200ed8087d1ebae094e7b57 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Mon, 17 Aug 2026 18:30:55 +0200 Subject: [PATCH] cmake: Require MbedTLS 3 and exclude 4 or later Until the codebase is updated to support it, CMake will explicitly search for version 3 that is supported by the codebase. --- frontend/cmake/feature-whatsnew.cmake | 2 +- frontend/cmake/os-windows.cmake | 2 +- plugins/obs-outputs/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/cmake/feature-whatsnew.cmake b/frontend/cmake/feature-whatsnew.cmake index fe5fb4437..46620fad1 100644 --- a/frontend/cmake/feature-whatsnew.cmake +++ b/frontend/cmake/feature-whatsnew.cmake @@ -7,7 +7,7 @@ if(ENABLE_WHATSNEW AND TARGET OBS::browser-panels) include(cmake/feature-macos-update.cmake) elseif(OS_LINUX) set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE) - find_package(MbedTLS REQUIRED) + find_package(MbedTLS 3...<4 REQUIRED) set(CMAKE_FIND_PACKAGE_PREFER_CONFIG FALSE) find_package(nlohmann_json 3.11 REQUIRED) diff --git a/frontend/cmake/os-windows.cmake b/frontend/cmake/os-windows.cmake index e8c6e0ca8..4c65aca6b 100644 --- a/frontend/cmake/os-windows.cmake +++ b/frontend/cmake/os-windows.cmake @@ -7,7 +7,7 @@ if(NOT TARGET OBS::w32-pthreads) endif() set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE) -find_package(MbedTLS REQUIRED) +find_package(MbedTLS 3...<4 REQUIRED) set(CMAKE_FIND_PACKAGE_PREFER_CONFIG FALSE) find_package(Detours REQUIRED) find_package(nlohmann_json 3.11 REQUIRED) diff --git a/plugins/obs-outputs/CMakeLists.txt b/plugins/obs-outputs/CMakeLists.txt index 4d3778df6..ef669862b 100644 --- a/plugins/obs-outputs/CMakeLists.txt +++ b/plugins/obs-outputs/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.28...3.30) set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE) -find_package(MbedTLS REQUIRED) +find_package(MbedTLS 3...<4 REQUIRED) set(CMAKE_FIND_PACKAGE_PREFER_CONFIG FALSE) find_package(ZLIB REQUIRED) find_package(jansson REQUIRED)