From 6c590805e88755f70ad62ffbb217ad8ace09563b Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Fri, 6 Oct 2023 00:59:37 +0200 Subject: [PATCH] cmake: Update supported CMake version range to 3.28 and 3.30 --- CMakeLists.txt | 4 ++-- CMakePresets.json | 6 +++--- UI/CMakeLists.txt | 2 +- UI/frontend-plugins/aja-output-ui/CMakeLists.txt | 2 +- .../decklink-captions/CMakeLists.txt | 2 +- .../decklink-output-ui/CMakeLists.txt | 2 +- UI/frontend-plugins/frontend-tools/CMakeLists.txt | 2 +- UI/obs-frontend-api/CMakeLists.txt | 2 +- UI/win-update/updater/CMakeLists.txt | 2 +- cmake/common/bootstrap.cmake | 3 --- cmake/common/buildspec_common.cmake | 4 +++- cmake/common/compiler_common.cmake | 6 +----- cmake/common/helpers_common.cmake | 15 +++++++++------ cmake/windows/architecture.cmake | 13 +++++++------ cmake/windows/buildspec.cmake | 4 ++-- cmake/windows/cpackconfig.cmake | 2 +- cmake/windows/defaults.cmake | 12 ------------ deps/blake2/CMakeLists.txt | 2 +- deps/glad/CMakeLists.txt | 2 +- deps/json11/CMakeLists.txt | 2 +- deps/libcaption/CMakeLists.txt | 2 +- deps/w32-pthreads/CMakeLists.txt | 2 +- libobs-d3d11/CMakeLists.txt | 2 +- libobs-opengl/CMakeLists.txt | 2 +- libobs-winrt/CMakeLists.txt | 2 +- libobs/CMakeLists.txt | 4 ++-- libobs/cmake/os-windows.cmake | 2 +- plugins/CMakeLists.txt | 4 ++-- plugins/aja/CMakeLists.txt | 2 +- plugins/coreaudio-encoder/CMakeLists.txt | 2 +- plugins/decklink/CMakeLists.txt | 2 +- plugins/image-source/CMakeLists.txt | 2 +- plugins/linux-alsa/CMakeLists.txt | 2 +- plugins/linux-capture/CMakeLists.txt | 2 +- plugins/linux-jack/CMakeLists.txt | 2 +- plugins/linux-pipewire/CMakeLists.txt | 2 +- plugins/linux-pulseaudio/CMakeLists.txt | 2 +- plugins/linux-v4l2/CMakeLists.txt | 2 +- plugins/mac-avcapture/CMakeLists.txt | 2 +- plugins/mac-avcapture/legacy/CMakeLists.txt | 2 +- plugins/mac-capture/CMakeLists.txt | 2 +- plugins/mac-syphon/CMakeLists.txt | 2 +- plugins/mac-videotoolbox/CMakeLists.txt | 2 +- plugins/mac-virtualcam/CMakeLists.txt | 2 +- .../src/camera-extension/CMakeLists.txt | 2 ++ .../mac-virtualcam/src/dal-plugin/CMakeLists.txt | 2 +- .../mac-virtualcam/src/obs-plugin/CMakeLists.txt | 2 +- plugins/nv-filters/CMakeLists.txt | 2 +- plugins/obs-ffmpeg/CMakeLists.txt | 2 +- plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt | 2 +- plugins/obs-ffmpeg/obs-amf-test/CMakeLists.txt | 2 +- plugins/obs-filters/CMakeLists.txt | 2 +- plugins/obs-libfdk/CMakeLists.txt | 2 +- plugins/obs-nvenc/CMakeLists.txt | 2 +- plugins/obs-nvenc/obs-nvenc-test/CMakeLists.txt | 2 +- plugins/obs-outputs/CMakeLists.txt | 2 +- plugins/obs-qsv11/CMakeLists.txt | 2 +- plugins/obs-qsv11/obs-qsv-test/CMakeLists.txt | 2 +- plugins/obs-text/CMakeLists.txt | 2 +- plugins/obs-transitions/CMakeLists.txt | 2 +- plugins/obs-vst/CMakeLists.txt | 2 +- plugins/obs-webrtc/CMakeLists.txt | 2 +- plugins/obs-x264/CMakeLists.txt | 2 +- plugins/oss-audio/CMakeLists.txt | 2 +- plugins/rtmp-services/CMakeLists.txt | 2 +- plugins/sndio/CMakeLists.txt | 2 +- plugins/text-freetype2/CMakeLists.txt | 2 +- plugins/vlc-video/CMakeLists.txt | 2 +- plugins/win-capture/CMakeLists.txt | 2 +- .../get-graphics-offsets/CMakeLists.txt | 8 ++++---- plugins/win-capture/graphics-hook/CMakeLists.txt | 8 ++++---- plugins/win-capture/inject-helper/CMakeLists.txt | 8 ++++---- plugins/win-dshow/CMakeLists.txt | 2 +- .../win-dshow/virtualcam-module/CMakeLists.txt | 8 ++++---- plugins/win-wasapi/CMakeLists.txt | 2 +- shared/bpm/CMakeLists.txt | 2 +- shared/file-updater/CMakeLists.txt | 2 +- shared/happy-eyeballs/CMakeLists.txt | 2 +- shared/ipc-util/CMakeLists.txt | 2 +- shared/media-playback/CMakeLists.txt | 2 +- shared/obs-d3d8-api/CMakeLists.txt | 2 +- shared/obs-hook-config/CMakeLists.txt | 2 +- shared/obs-inject-library/CMakeLists.txt | 2 +- shared/obs-scripting/CMakeLists.txt | 2 +- shared/obs-scripting/cmake/lua.cmake | 2 -- shared/obs-scripting/cmake/python.cmake | 2 -- shared/obs-scripting/obslua/CMakeLists.txt | 2 +- shared/obs-scripting/obspython/CMakeLists.txt | 2 +- shared/obs-shared-memory-queue/CMakeLists.txt | 2 +- shared/obs-tiny-nv12-scale/CMakeLists.txt | 2 +- shared/opts-parser/CMakeLists.txt | 2 +- shared/properties-view/CMakeLists.txt | 2 +- shared/qt/icon-label/CMakeLists.txt | 2 +- shared/qt/plain-text-edit/CMakeLists.txt | 2 +- shared/qt/slider-ignorewheel/CMakeLists.txt | 2 +- shared/qt/vertical-scroll-area/CMakeLists.txt | 2 +- shared/qt/wrappers/CMakeLists.txt | 2 +- test/test-input/CMakeLists.txt | 2 +- 98 files changed, 129 insertions(+), 144 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9819235af..6a45780d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCOPE) @@ -6,7 +6,7 @@ project(obs-studio VERSION ${OBS_VERSION_CANONICAL}) if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/windows/architecture.cmake") - if(NOT OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) + if(NOT OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_VS_PLATFORM_NAME) return() endif() endif() diff --git a/CMakePresets.json b/CMakePresets.json index be85184b7..4fd2afd2c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,8 +1,8 @@ { - "version": 3, + "version": 8, "cmakeMinimumRequired": { "major": 3, - "minor": 22, + "minor": 28, "patch": 0 }, "configurePresets": [ @@ -98,7 +98,7 @@ "lhs": "${hostSystemName}", "rhs": "Windows" }, - "architecture": "x64", + "architecture": "x64,version=10.0.20348", "binaryDir": "${sourceDir}/build_x64", "generator": "Visual Studio 17 2022", "cacheVariables": { diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt index d793644a0..0917c82c8 100644 --- a/UI/CMakeLists.txt +++ b/UI/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_subdirectory(obs-frontend-api) diff --git a/UI/frontend-plugins/aja-output-ui/CMakeLists.txt b/UI/frontend-plugins/aja-output-ui/CMakeLists.txt index da8db3cad..37e4ba04d 100644 --- a/UI/frontend-plugins/aja-output-ui/CMakeLists.txt +++ b/UI/frontend-plugins/aja-output-ui/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(NOT ENABLE_AJA) target_disable(aja-output-ui) diff --git a/UI/frontend-plugins/decklink-captions/CMakeLists.txt b/UI/frontend-plugins/decklink-captions/CMakeLists.txt index 5e84b2a80..53dab0da1 100644 --- a/UI/frontend-plugins/decklink-captions/CMakeLists.txt +++ b/UI/frontend-plugins/decklink-captions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(NOT ENABLE_DECKLINK) target_disable(decklink-captions) diff --git a/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt b/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt index 9df137b2d..d72dac269 100644 --- a/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt +++ b/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(NOT ENABLE_DECKLINK) target_disable(decklink-output-ui) diff --git a/UI/frontend-plugins/frontend-tools/CMakeLists.txt b/UI/frontend-plugins/frontend-tools/CMakeLists.txt index 9f01a3d57..f7ffa4ae3 100644 --- a/UI/frontend-plugins/frontend-tools/CMakeLists.txt +++ b/UI/frontend-plugins/frontend-tools/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(Qt6 REQUIRED Widgets) diff --git a/UI/obs-frontend-api/CMakeLists.txt b/UI/obs-frontend-api/CMakeLists.txt index cd019c8d2..a2fa52d34 100644 --- a/UI/obs-frontend-api/CMakeLists.txt +++ b/UI/obs-frontend-api/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(obs-frontend-api SHARED) add_library(OBS::frontend-api ALIAS obs-frontend-api) diff --git a/UI/win-update/updater/CMakeLists.txt b/UI/win-update/updater/CMakeLists.txt index 2cba74e05..dcd10bb4b 100644 --- a/UI/win-update/updater/CMakeLists.txt +++ b/UI/win-update/updater/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(zstd) find_package(nlohmann_json 3 REQUIRED) diff --git a/cmake/common/bootstrap.cmake b/cmake/common/bootstrap.cmake index 493ef313e..e6caa7c84 100644 --- a/cmake/common/bootstrap.cmake +++ b/cmake/common/bootstrap.cmake @@ -40,9 +40,6 @@ if("${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") file(REMOVE_RECURSE "${CMAKE_CURRENT_SOURCE_DIR}/CMakeCache.txt" "${CMAKE_CURRENT_SOURCE_DIR}/CMakeFiles") endif() -# Use folders for source file organization with IDE generators (Visual Studio/Xcode) -set_property(GLOBAL PROPERTY USE_FOLDERS TRUE) - # Set default global project variables set(OBS_COMPANY_NAME "OBS Project") set(OBS_PRODUCT_NAME "OBS Studio") diff --git a/cmake/common/buildspec_common.cmake b/cmake/common/buildspec_common.cmake index 18d143147..c7844f0c2 100644 --- a/cmake/common/buildspec_common.cmake +++ b/cmake/common/buildspec_common.cmake @@ -29,7 +29,7 @@ function(_check_deps_version version) ) list(REMOVE_ITEM CMAKE_PREFIX_PATH "${path}") list(APPEND CMAKE_PREFIX_PATH "${path}") - set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) + continue() else() message( @@ -42,6 +42,8 @@ function(_check_deps_version version) endif() endif() endforeach() + + return(PROPAGATE found CMAKE_PREFIX_PATH) endfunction() # _check_dependencies: Fetch and extract pre-built OBS build dependencies diff --git a/cmake/common/compiler_common.cmake b/cmake/common/compiler_common.cmake index 731ecf675..e9b1d370f 100644 --- a/cmake/common/compiler_common.cmake +++ b/cmake/common/compiler_common.cmake @@ -6,11 +6,7 @@ option(OBS_COMPILE_DEPRECATION_AS_WARNING "Downgrade deprecation warnings to act mark_as_advanced(OBS_COMPILE_DEPRECATION_AS_WARNING) # Set C and C++ language standards to C17 and C++17 -if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21) - set(CMAKE_C_STANDARD 17) -else() - set(CMAKE_C_STANDARD 11) -endif() +set(CMAKE_C_STANDARD 17) set(CMAKE_C_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) diff --git a/cmake/common/helpers_common.cmake b/cmake/common/helpers_common.cmake index a8ff5067c..f5534ed66 100644 --- a/cmake/common/helpers_common.cmake +++ b/cmake/common/helpers_common.cmake @@ -203,14 +203,14 @@ function(find_dependencies) endforeach() if(NOT is_root) - set(found_libraries ${found_libraries} PARENT_SCOPE) # Exit recursive branch - return() + return(PROPAGATE found_libraries) endif() list(REMOVE_DUPLICATES found_libraries) list(APPEND ${var_FOUND_VAR} ${found_libraries}) - set(${var_FOUND_VAR} ${${var_FOUND_VAR}} PARENT_SCOPE) + + return(PROPAGATE ${var_FOUND_VAR}) endfunction() # find_qt_plugins: Find and add Qt plugin libraries associated with Qt component to target @@ -278,7 +278,8 @@ function(find_qt_plugins) endforeach() endif() - set(${var_FOUND_VAR} ${plugins_list} PARENT_SCOPE) + set(${var_FOUND_VAR} ${plugins_list}) + return(PROPAGATE ${var_FOUND_VAR}) endfunction() # target_export: Helper function to export target as CMake package @@ -432,7 +433,9 @@ function(check_uuid uuid_string return_value) set(valid_uuid FALSE) endif() message(DEBUG "UUID ${uuid_string} valid: ${valid_uuid}") - set(${return_value} ${valid_uuid} PARENT_SCOPE) + + set(${return_value} ${valid_uuid}) + return(PROPAGATE ${return_value}) endfunction() # add_obs_plugin: Add plugin subdirectory if host platform is in specified list of supported platforms and architectures @@ -465,7 +468,7 @@ function(add_obs_plugin target) else() foreach(architecture IN LISTS _AOP_ARCHITECTURES) if(OS_WINDOWS) - if("${architecture}" STREQUAL CMAKE_GENERATOR_PLATFORM) + if("${architecture}" STREQUAL CMAKE_VS_PLATFORM_NAME) set(found_architecture TRUE) endif() elseif(OS_MACOS) diff --git a/cmake/windows/architecture.cmake b/cmake/windows/architecture.cmake index 4b8a34f03..1fc9ed23f 100644 --- a/cmake/windows/architecture.cmake +++ b/cmake/windows/architecture.cmake @@ -5,19 +5,20 @@ include_guard(GLOBAL) include(compilerconfig) if(NOT DEFINED OBS_PARENT_ARCHITECTURE) - if(CMAKE_GENERATOR_PLATFORM MATCHES "(Win32|x64)") - set(OBS_PARENT_ARCHITECTURE ${CMAKE_GENERATOR_PLATFORM}) + if(CMAKE_VS_PLATFORM_NAME MATCHES "(Win32|x64)") + set(OBS_PARENT_ARCHITECTURE ${CMAKE_VS_PLATFORM_NAME}) else() - message(FATAL_ERROR "Unsupported generator platform for Windows builds: ${CMAKE_GENERATOR_PLATFORM}!") + message(FATAL_ERROR "Unsupported generator platform for Windows builds: ${CMAKE_VS_PLATFORM_NAME}!") endif() endif() -if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) +if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_VS_PLATFORM_NAME) if(OBS_PARENT_ARCHITECTURE STREQUAL x64) execute_process( COMMAND - "${CMAKE_COMMAND}" -S ${CMAKE_CURRENT_SOURCE_DIR} -B ${CMAKE_SOURCE_DIR}/build_x86 -A Win32 -G - "${CMAKE_GENERATOR}" -DCMAKE_SYSTEM_VERSION:STRING='${CMAKE_SYSTEM_VERSION}' -DOBS_CMAKE_VERSION:STRING=3.0.0 + "${CMAKE_COMMAND}" -S ${CMAKE_CURRENT_SOURCE_DIR} -B ${CMAKE_SOURCE_DIR}/build_x86 -A + "Win32,version=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}" -G "${CMAKE_GENERATOR}" + -DCMAKE_SYSTEM_VERSION:STRING='${CMAKE_SYSTEM_VERSION}' -DOBS_CMAKE_VERSION:STRING=3.0.0 -DVIRTUALCAM_GUID:STRING=${VIRTUALCAM_GUID} -DCMAKE_MESSAGE_LOG_LEVEL:STRING=${CMAKE_MESSAGE_LOG_LEVEL} -DENABLE_CCACHE:BOOL=${ENABLE_CCACHE} -DOBS_PARENT_ARCHITECTURE:STRING=x64 RESULT_VARIABLE _process_result diff --git a/cmake/windows/buildspec.cmake b/cmake/windows/buildspec.cmake index b15cbb2e2..50f1a4e75 100644 --- a/cmake/windows/buildspec.cmake +++ b/cmake/windows/buildspec.cmake @@ -14,11 +14,11 @@ function(_check_dependencies_windows) set(cef_filename "cef_binary_VERSION_windows_ARCH_REVISION.zip") set(cef_destination "cef_binary_VERSION_windows_ARCH") - if(CMAKE_GENERATOR_PLATFORM STREQUAL Win32) + if(CMAKE_VS_PLATFORM_NAME STREQUAL Win32) set(arch x86) set(dependencies_list prebuilt) else() - string(TOLOWER "${CMAKE_GENERATOR_PLATFORM}" arch) + string(TOLOWER "${CMAKE_VS_PLATFORM_NAME}" arch) set(dependencies_list prebuilt qt6 cef) endif() set(platform windows-${arch}) diff --git a/cmake/windows/cpackconfig.cmake b/cmake/windows/cpackconfig.cmake index bd82e4e8b..2191e34dc 100644 --- a/cmake/windows/cpackconfig.cmake +++ b/cmake/windows/cpackconfig.cmake @@ -7,7 +7,7 @@ include(cpackconfig_common) # Add GPLv2 license file to CPack set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/UI/data/license/gplv2.txt") set(CPACK_PACKAGE_VERSION "${OBS_VERSION_CANONICAL}") -set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-windows-${CMAKE_GENERATOR_PLATFORM}") +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-windows-${CMAKE_VS_PLATFORM_NAME}") set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY FALSE) set(CPACK_GENERATOR ZIP) set(CPACK_THREADS 0) diff --git a/cmake/windows/defaults.cmake b/cmake/windows/defaults.cmake index a9c4c1b1a..c2e141105 100644 --- a/cmake/windows/defaults.cmake +++ b/cmake/windows/defaults.cmake @@ -23,15 +23,3 @@ set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL TRUE) include(buildspec) include(cpackconfig) - -if(CMAKE_GENERATOR_PLATFORM STREQUAL x64) - execute_process( - COMMAND - "${CMAKE_COMMAND}" -S ${CMAKE_CURRENT_SOURCE_DIR} -B ${CMAKE_SOURCE_DIR}/build_x86 -A Win32 -G - "${CMAKE_GENERATOR}" -DCMAKE_SYSTEM_VERSION:STRING='${CMAKE_SYSTEM_VERSION}' -DOBS_CMAKE_VERSION:STRING=3.0.0 - -DVIRTUALCAM_GUID:STRING=${VIRTUALCAM_GUID} -DCMAKE_MESSAGE_LOG_LEVEL=${CMAKE_MESSAGE_LOG_LEVEL} - -DENABLE_CCACHE=${ENABLE_CCACHE} - RESULT_VARIABLE _process_result - COMMAND_ERROR_IS_FATAL ANY - ) -endif() diff --git a/deps/blake2/CMakeLists.txt b/deps/blake2/CMakeLists.txt index f6911749f..894412e09 100644 --- a/deps/blake2/CMakeLists.txt +++ b/deps/blake2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(blake2 OBJECT) add_library(OBS::blake2 ALIAS blake2) diff --git a/deps/glad/CMakeLists.txt b/deps/glad/CMakeLists.txt index d62a7d85a..35a682e1e 100644 --- a/deps/glad/CMakeLists.txt +++ b/deps/glad/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(OpenGL REQUIRED) diff --git a/deps/json11/CMakeLists.txt b/deps/json11/CMakeLists.txt index 9e1c6804b..cda8e1daf 100644 --- a/deps/json11/CMakeLists.txt +++ b/deps/json11/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(json11 OBJECT) add_library(OBS::json11 ALIAS json11) diff --git a/deps/libcaption/CMakeLists.txt b/deps/libcaption/CMakeLists.txt index 8ee743154..58baf8068 100644 --- a/deps/libcaption/CMakeLists.txt +++ b/deps/libcaption/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(caption STATIC EXCLUDE_FROM_ALL) add_library(OBS::caption ALIAS caption) diff --git a/deps/w32-pthreads/CMakeLists.txt b/deps/w32-pthreads/CMakeLists.txt index 40c47c229..257e75249 100644 --- a/deps/w32-pthreads/CMakeLists.txt +++ b/deps/w32-pthreads/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(w32-pthreads SHARED EXCLUDE_FROM_ALL) add_library(OBS::w32-pthreads ALIAS w32-pthreads) diff --git a/libobs-d3d11/CMakeLists.txt b/libobs-d3d11/CMakeLists.txt index 89045322e..5889e8501 100644 --- a/libobs-d3d11/CMakeLists.txt +++ b/libobs-d3d11/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(libobs-d3d11 MODULE) add_library(OBS::libobs-d3d11 ALIAS libobs-d3d11) diff --git a/libobs-opengl/CMakeLists.txt b/libobs-opengl/CMakeLists.txt index 61205f647..c628283b6 100644 --- a/libobs-opengl/CMakeLists.txt +++ b/libobs-opengl/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(libobs-opengl SHARED) add_library(OBS::libobs-opengl ALIAS libobs-opengl) diff --git a/libobs-winrt/CMakeLists.txt b/libobs-winrt/CMakeLists.txt index 1926b5a56..aee1fc62f 100644 --- a/libobs-winrt/CMakeLists.txt +++ b/libobs-winrt/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(libobs-winrt-headers INTERFACE) add_library(OBS::winrt-headers ALIAS libobs-winrt-headers) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt index 828a576ea..f55917da4 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt @@ -1,8 +1,8 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) include(cmake/obs-version.cmake) -if(OS_WINDOWS AND NOT OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) +if(OS_WINDOWS AND NOT OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_VS_PLATFORM_NAME) include(cmake/os-windows.cmake) return() endif() diff --git a/libobs/cmake/os-windows.cmake b/libobs/cmake/os-windows.cmake index 59d6ec35b..89a985b90 100644 --- a/libobs/cmake/os-windows.cmake +++ b/libobs/cmake/os-windows.cmake @@ -30,7 +30,7 @@ if(NOT TARGET OBS::w32-pthreads) add_subdirectory("${CMAKE_SOURCE_DIR}/deps/w32-pthreads" "${CMAKE_BINARY_DIR}/deps/w32-pthreads") endif() -if(NOT OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) +if(NOT OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_VS_PLATFORM_NAME) return() endif() diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 1769a02a9..1af782adc 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_PLUGINS "Enable building OBS plugins" ON) @@ -10,7 +10,7 @@ endif() set_property(GLOBAL APPEND PROPERTY OBS_FEATURES_ENABLED "Plugin Support") macro(check_obs_browser) - if((OS_WINDOWS AND CMAKE_GENERATOR_PLATFORM MATCHES "(Win32|x64)") OR OS_MACOS OR OS_LINUX) + if((OS_WINDOWS AND CMAKE_VS_PLATFORM_NAME MATCHES "(Win32|x64)") OR OS_MACOS OR OS_LINUX) if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/obs-browser/CMakeLists.txt") message(FATAL_ERROR "Required submodule 'obs-browser' not available.") else() diff --git a/plugins/aja/CMakeLists.txt b/plugins/aja/CMakeLists.txt index fdb96f76f..88ef18cad 100644 --- a/plugins/aja/CMakeLists.txt +++ b/plugins/aja/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_AJA "Build OBS with aja support" ON) diff --git a/plugins/coreaudio-encoder/CMakeLists.txt b/plugins/coreaudio-encoder/CMakeLists.txt index 5eac410b2..099995d89 100644 --- a/plugins/coreaudio-encoder/CMakeLists.txt +++ b/plugins/coreaudio-encoder/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(OS_WINDOWS) option(ENABLE_COREAUDIO_ENCODER "Enable building with CoreAudio encoder (Windows)" ON) diff --git a/plugins/decklink/CMakeLists.txt b/plugins/decklink/CMakeLists.txt index 43e5078c6..99fa82725 100644 --- a/plugins/decklink/CMakeLists.txt +++ b/plugins/decklink/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_DECKLINK "Build OBS with Decklink support" ON) if(NOT ENABLE_DECKLINK) diff --git a/plugins/image-source/CMakeLists.txt b/plugins/image-source/CMakeLists.txt index 7a6edc07a..b5ce2b2b0 100644 --- a/plugins/image-source/CMakeLists.txt +++ b/plugins/image-source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(image-source MODULE) add_library(OBS::image-source ALIAS image-source) diff --git a/plugins/linux-alsa/CMakeLists.txt b/plugins/linux-alsa/CMakeLists.txt index b90147da4..7e7b2f524 100644 --- a/plugins/linux-alsa/CMakeLists.txt +++ b/plugins/linux-alsa/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_ALSA "Build OBS with ALSA support" ON) diff --git a/plugins/linux-capture/CMakeLists.txt b/plugins/linux-capture/CMakeLists.txt index 55415b272..d498df2b3 100644 --- a/plugins/linux-capture/CMakeLists.txt +++ b/plugins/linux-capture/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(X11 REQUIRED) diff --git a/plugins/linux-jack/CMakeLists.txt b/plugins/linux-jack/CMakeLists.txt index 65aed52e4..4e58530a7 100644 --- a/plugins/linux-jack/CMakeLists.txt +++ b/plugins/linux-jack/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_JACK "Build OBS with JACK support" OFF) if(NOT ENABLE_JACK) diff --git a/plugins/linux-pipewire/CMakeLists.txt b/plugins/linux-pipewire/CMakeLists.txt index 5f93636d5..3df1c24d0 100644 --- a/plugins/linux-pipewire/CMakeLists.txt +++ b/plugins/linux-pipewire/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_PIPEWIRE "Enable PipeWire support" ON) if(NOT ENABLE_PIPEWIRE) diff --git a/plugins/linux-pulseaudio/CMakeLists.txt b/plugins/linux-pulseaudio/CMakeLists.txt index 6e11f8b98..5ab582c16 100644 --- a/plugins/linux-pulseaudio/CMakeLists.txt +++ b/plugins/linux-pulseaudio/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(NOT ENABLE_PULSEAUDIO) target_disable(linux-pulseaudio) diff --git a/plugins/linux-v4l2/CMakeLists.txt b/plugins/linux-v4l2/CMakeLists.txt index 7a36555f4..aafbc0d28 100644 --- a/plugins/linux-v4l2/CMakeLists.txt +++ b/plugins/linux-v4l2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_V4L2 "Build OBS with v4l2 support" ON) option(ENABLE_UDEV "Build linux-v4l2 with UDEV support" ON) diff --git a/plugins/mac-avcapture/CMakeLists.txt b/plugins/mac-avcapture/CMakeLists.txt index 7a4f11c01..da15892ca 100644 --- a/plugins/mac-avcapture/CMakeLists.txt +++ b/plugins/mac-avcapture/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(mac-avcapture-legacy MODULE) add_library(OBS::avcapture-legacy ALIAS mac-avcapture-legacy) diff --git a/plugins/mac-avcapture/legacy/CMakeLists.txt b/plugins/mac-avcapture/legacy/CMakeLists.txt index c9695a0e8..81c837317 100644 --- a/plugins/mac-avcapture/legacy/CMakeLists.txt +++ b/plugins/mac-avcapture/legacy/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(mac-avcapture MODULE) add_library(OBS::avcapture ALIAS mac-avcapture) diff --git a/plugins/mac-capture/CMakeLists.txt b/plugins/mac-capture/CMakeLists.txt index 8998141e4..31d896a01 100644 --- a/plugins/mac-capture/CMakeLists.txt +++ b/plugins/mac-capture/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(mac-capture MODULE) add_library(OBS::capture ALIAS mac-capture) diff --git a/plugins/mac-syphon/CMakeLists.txt b/plugins/mac-syphon/CMakeLists.txt index eb7033e6c..a0d486042 100644 --- a/plugins/mac-syphon/CMakeLists.txt +++ b/plugins/mac-syphon/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_SYPHON "Enable Syphon sharing support" ON) if(NOT ENABLE_SYPHON) diff --git a/plugins/mac-videotoolbox/CMakeLists.txt b/plugins/mac-videotoolbox/CMakeLists.txt index 4e8c5aa33..19bddaca3 100644 --- a/plugins/mac-videotoolbox/CMakeLists.txt +++ b/plugins/mac-videotoolbox/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(mac-videotoolbox MODULE) add_library(OBS::mac-videotoolbox ALIAS mac-videotoolbox) diff --git a/plugins/mac-virtualcam/CMakeLists.txt b/plugins/mac-virtualcam/CMakeLists.txt index d4f9bc008..cb76aff52 100644 --- a/plugins/mac-virtualcam/CMakeLists.txt +++ b/plugins/mac-virtualcam/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_VIRTUALCAM "Build OBS Virtualcam" ON) diff --git a/plugins/mac-virtualcam/src/camera-extension/CMakeLists.txt b/plugins/mac-virtualcam/src/camera-extension/CMakeLists.txt index 9a52c5a94..ff2bc441c 100644 --- a/plugins/mac-virtualcam/src/camera-extension/CMakeLists.txt +++ b/plugins/mac-virtualcam/src/camera-extension/CMakeLists.txt @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.28...3.30) + foreach(_uuid IN ITEMS VIRTUALCAM_DEVICE_UUID VIRTUALCAM_SOURCE_UUID VIRTUALCAM_SINK_UUID) set(VALID_UUID FALSE) if(NOT ${_uuid}) diff --git a/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt b/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt index 40b9fbbf1..5ca1ada19 100644 --- a/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt +++ b/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(obs-dal-plugin MODULE) add_library(OBS::dal-plugin ALIAS obs-dal-plugin) diff --git a/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt b/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt index ef083725c..96f0128c5 100644 --- a/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt +++ b/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(mac-virtualcam MODULE) add_library(OBS::virtualcam ALIAS mac-virtualcam) diff --git a/plugins/nv-filters/CMakeLists.txt b/plugins/nv-filters/CMakeLists.txt index 9047e3cee..0547963e1 100644 --- a/plugins/nv-filters/CMakeLists.txt +++ b/plugins/nv-filters/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(OS_WINDOWS) add_library(nv-filters MODULE) add_library(OBS::nv-filters ALIAS nv-filters) diff --git a/plugins/obs-ffmpeg/CMakeLists.txt b/plugins/obs-ffmpeg/CMakeLists.txt index 818b64b28..6bc0ab087 100644 --- a/plugins/obs-ffmpeg/CMakeLists.txt +++ b/plugins/obs-ffmpeg/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_FFMPEG_LOGGING "Enables obs-ffmpeg logging" OFF) option(ENABLE_NEW_MPEGTS_OUTPUT "Use native SRT/RIST mpegts output" ON) diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt b/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt index 4d275ab70..c1f95297f 100644 --- a/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt +++ b/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_FFMPEG_MUX_DEBUG "Enable FFmpeg-mux debugging" OFF) diff --git a/plugins/obs-ffmpeg/obs-amf-test/CMakeLists.txt b/plugins/obs-ffmpeg/obs-amf-test/CMakeLists.txt index a08b6c0d8..72cbfeaa0 100644 --- a/plugins/obs-ffmpeg/obs-amf-test/CMakeLists.txt +++ b/plugins/obs-ffmpeg/obs-amf-test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(AMF 1.4.29 REQUIRED) diff --git a/plugins/obs-filters/CMakeLists.txt b/plugins/obs-filters/CMakeLists.txt index 269f9f512..753ec87c5 100644 --- a/plugins/obs-filters/CMakeLists.txt +++ b/plugins/obs-filters/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(obs-filters MODULE) add_library(OBS::filters ALIAS obs-filters) diff --git a/plugins/obs-libfdk/CMakeLists.txt b/plugins/obs-libfdk/CMakeLists.txt index f171c6c74..c785a08db 100644 --- a/plugins/obs-libfdk/CMakeLists.txt +++ b/plugins/obs-libfdk/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_LIBFDK "Enable FDK AAC support" OFF) if(NOT ENABLE_LIBFDK) diff --git a/plugins/obs-nvenc/CMakeLists.txt b/plugins/obs-nvenc/CMakeLists.txt index 0b4fe2b61..93053c1ed 100644 --- a/plugins/obs-nvenc/CMakeLists.txt +++ b/plugins/obs-nvenc/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_NVENC "Build NVIDIA Hardware Encoder Plugin" ON) option(ENABLE_NVENC_FFMPEG_IDS "Register FFmpeg encoder IDs" ON) diff --git a/plugins/obs-nvenc/obs-nvenc-test/CMakeLists.txt b/plugins/obs-nvenc/obs-nvenc-test/CMakeLists.txt index 97ece8772..7f839256e 100644 --- a/plugins/obs-nvenc/obs-nvenc-test/CMakeLists.txt +++ b/plugins/obs-nvenc/obs-nvenc-test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(FFnvcodec 12 REQUIRED) diff --git a/plugins/obs-outputs/CMakeLists.txt b/plugins/obs-outputs/CMakeLists.txt index e8b83d2fc..21818d568 100644 --- a/plugins/obs-outputs/CMakeLists.txt +++ b/plugins/obs-outputs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(MbedTLS REQUIRED) find_package(ZLIB REQUIRED) diff --git a/plugins/obs-qsv11/CMakeLists.txt b/plugins/obs-qsv11/CMakeLists.txt index 7aa42585c..8966280e6 100644 --- a/plugins/obs-qsv11/CMakeLists.txt +++ b/plugins/obs-qsv11/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_QSV11 "Build Intel QSV11 Hardware Encoder." TRUE) if(NOT ENABLE_QSV11) diff --git a/plugins/obs-qsv11/obs-qsv-test/CMakeLists.txt b/plugins/obs-qsv11/obs-qsv-test/CMakeLists.txt index 668bc9cff..f46839899 100644 --- a/plugins/obs-qsv11/obs-qsv-test/CMakeLists.txt +++ b/plugins/obs-qsv11/obs-qsv-test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_executable(obs-qsv-test) diff --git a/plugins/obs-text/CMakeLists.txt b/plugins/obs-text/CMakeLists.txt index 118157862..0ae9cd4ef 100644 --- a/plugins/obs-text/CMakeLists.txt +++ b/plugins/obs-text/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(obs-text MODULE) add_library(OBS::text ALIAS obs-text) diff --git a/plugins/obs-transitions/CMakeLists.txt b/plugins/obs-transitions/CMakeLists.txt index 6af13a2e6..2b5c1e323 100644 --- a/plugins/obs-transitions/CMakeLists.txt +++ b/plugins/obs-transitions/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(obs-transitions MODULE) add_library(OBS::transition ALIAS obs-transitions) diff --git a/plugins/obs-vst/CMakeLists.txt b/plugins/obs-vst/CMakeLists.txt index 683be4e77..8a2b4eb79 100644 --- a/plugins/obs-vst/CMakeLists.txt +++ b/plugins/obs-vst/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_VST "Enable building OBS with VST plugin" ON) diff --git a/plugins/obs-webrtc/CMakeLists.txt b/plugins/obs-webrtc/CMakeLists.txt index 5a8a325ce..d57ca8af5 100644 --- a/plugins/obs-webrtc/CMakeLists.txt +++ b/plugins/obs-webrtc/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_WEBRTC "Enable WebRTC Output support" ON) if(NOT ENABLE_WEBRTC) diff --git a/plugins/obs-x264/CMakeLists.txt b/plugins/obs-x264/CMakeLists.txt index 010f031b5..958d553c8 100644 --- a/plugins/obs-x264/CMakeLists.txt +++ b/plugins/obs-x264/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(Libx264 REQUIRED) diff --git a/plugins/oss-audio/CMakeLists.txt b/plugins/oss-audio/CMakeLists.txt index d753466a9..5ae20e2cc 100644 --- a/plugins/oss-audio/CMakeLists.txt +++ b/plugins/oss-audio/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_OSS "Enable building with OSS audio support" ON) diff --git a/plugins/rtmp-services/CMakeLists.txt b/plugins/rtmp-services/CMakeLists.txt index 78571eb06..be0364cb7 100644 --- a/plugins/rtmp-services/CMakeLists.txt +++ b/plugins/rtmp-services/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_SERVICE_UPDATES "Checks for service updates" ON) diff --git a/plugins/sndio/CMakeLists.txt b/plugins/sndio/CMakeLists.txt index 0d7448a90..f76e7c07e 100644 --- a/plugins/sndio/CMakeLists.txt +++ b/plugins/sndio/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_SNDIO "Build OBS with sndio support" OFF) if(NOT ENABLE_SNDIO) diff --git a/plugins/text-freetype2/CMakeLists.txt b/plugins/text-freetype2/CMakeLists.txt index da768e7fd..8643dd0b7 100644 --- a/plugins/text-freetype2/CMakeLists.txt +++ b/plugins/text-freetype2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_FREETYPE "Enable FreeType text plugin" ON) diff --git a/plugins/vlc-video/CMakeLists.txt b/plugins/vlc-video/CMakeLists.txt index 4cce9b027..871036c9f 100644 --- a/plugins/vlc-video/CMakeLists.txt +++ b/plugins/vlc-video/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) macro(check_vlc_path) find_package(PkgConfig QUIET) diff --git a/plugins/win-capture/CMakeLists.txt b/plugins/win-capture/CMakeLists.txt index 3e855943e..8216ba509 100644 --- a/plugins/win-capture/CMakeLists.txt +++ b/plugins/win-capture/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(NOT TARGET OBS::obfuscate) add_subdirectory("${CMAKE_SOURCE_DIR}/libobs" "${CMAKE_BINARY_DIR}/libobs") diff --git a/plugins/win-capture/get-graphics-offsets/CMakeLists.txt b/plugins/win-capture/get-graphics-offsets/CMakeLists.txt index f48f02803..fffb3b4e6 100644 --- a/plugins/win-capture/get-graphics-offsets/CMakeLists.txt +++ b/plugins/win-capture/get-graphics-offsets/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(NOT TARGET OBS::d3d8-api) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-d3d8-api" obs-d3d8-api) @@ -19,8 +19,8 @@ target_link_libraries( PRIVATE OBS::hook-config OBS::d3d8-api d3d9.lib dxgi.lib d3d11.lib ) -if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) - if(CMAKE_GENERATOR_PLATFORM STREQUAL x64) +if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_VS_PLATFORM_NAME) + if(CMAKE_VS_PLATFORM_NAME STREQUAL x64) add_custom_command( TARGET get-graphics-offsets POST_BUILD @@ -32,7 +32,7 @@ if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) add_dependencies(win-capture get-graphics-offsets) endif() -if(CMAKE_GENERATOR_PLATFORM STREQUAL x64) +if(CMAKE_VS_PLATFORM_NAME STREQUAL x64) set(_OUTPUT_NAME get-graphics-offsets64) else() set(_OUTPUT_NAME get-graphics-offsets32) diff --git a/plugins/win-capture/graphics-hook/CMakeLists.txt b/plugins/win-capture/graphics-hook/CMakeLists.txt index 63f0fcc61..caa1bc532 100644 --- a/plugins/win-capture/graphics-hook/CMakeLists.txt +++ b/plugins/win-capture/graphics-hook/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(Detours REQUIRED) find_package(Vulkan REQUIRED) @@ -54,8 +54,8 @@ if(TARGET Vulkan::Vulkan) target_compile_definitions(graphics-hook PRIVATE COMPILE_VULKAN_HOOK) endif() -if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) - if(CMAKE_GENERATOR_PLATFORM STREQUAL x64) +if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_VS_PLATFORM_NAME) + if(CMAKE_VS_PLATFORM_NAME STREQUAL x64) add_custom_command( TARGET graphics-hook POST_BUILD @@ -67,7 +67,7 @@ if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) add_dependencies(win-capture graphics-hook) endif() -if(CMAKE_GENERATOR_PLATFORM STREQUAL x64) +if(CMAKE_VS_PLATFORM_NAME STREQUAL x64) set(_OUTPUT_NAME graphics-hook64) else() set(_OUTPUT_NAME graphics-hook32) diff --git a/plugins/win-capture/inject-helper/CMakeLists.txt b/plugins/win-capture/inject-helper/CMakeLists.txt index b73f672ef..ae62a032a 100644 --- a/plugins/win-capture/inject-helper/CMakeLists.txt +++ b/plugins/win-capture/inject-helper/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(NOT TARGET OBS::obfuscate) add_subdirectory("${CMAKE_SOURCE_DIR}/libobs" "${CMAKE_BINARY_DIR}/libobs") @@ -14,8 +14,8 @@ target_sources(inject-helper PRIVATE inject-helper.c) target_link_libraries(inject-helper PRIVATE OBS::inject-library OBS::obfuscate) -if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) - if(CMAKE_GENERATOR_PLATFORM STREQUAL x64) +if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_VS_PLATFORM_NAME) + if(CMAKE_VS_PLATFORM_NAME STREQUAL x64) add_custom_command( TARGET inject-helper POST_BUILD @@ -27,7 +27,7 @@ if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) add_dependencies(win-capture inject-helper) endif() -if(CMAKE_GENERATOR_PLATFORM STREQUAL x64) +if(CMAKE_VS_PLATFORM_NAME STREQUAL x64) set(_OUTPUT_NAME inject-helper64) else() set(_OUTPUT_NAME inject-helper32) diff --git a/plugins/win-dshow/CMakeLists.txt b/plugins/win-dshow/CMakeLists.txt index c04c90fb0..078151f69 100644 --- a/plugins/win-dshow/CMakeLists.txt +++ b/plugins/win-dshow/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(FFmpeg REQUIRED avcodec avutil) diff --git a/plugins/win-dshow/virtualcam-module/CMakeLists.txt b/plugins/win-dshow/virtualcam-module/CMakeLists.txt index ac8f46e18..bc77f8efb 100644 --- a/plugins/win-dshow/virtualcam-module/CMakeLists.txt +++ b/plugins/win-dshow/virtualcam-module/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_VIRTUALCAM "Enable Windows Virtual Camera" ON) if(NOT ENABLE_VIRTUALCAM) @@ -104,8 +104,8 @@ target_link_libraries( winmm ) -if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) - if(CMAKE_GENERATOR_PLATFORM STREQUAL x64) +if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_VS_PLATFORM_NAME) + if(CMAKE_VS_PLATFORM_NAME STREQUAL x64) add_custom_command( TARGET obs-virtualcam-module POST_BUILD @@ -117,7 +117,7 @@ if(OBS_PARENT_ARCHITECTURE STREQUAL CMAKE_GENERATOR_PLATFORM) add_dependencies(win-dshow obs-virtualcam-module) endif() -if(CMAKE_GENERATOR_PLATFORM STREQUAL x64) +if(CMAKE_VS_PLATFORM_NAME STREQUAL x64) set(_OUTPUT_NAME virtualcam-module64) else() set(_OUTPUT_NAME virtualcam-module32) diff --git a/plugins/win-wasapi/CMakeLists.txt b/plugins/win-wasapi/CMakeLists.txt index 7b7298acb..4d3da03fc 100644 --- a/plugins/win-wasapi/CMakeLists.txt +++ b/plugins/win-wasapi/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(win-wasapi MODULE) add_library(OBS::wasapi ALIAS win-wasapi) diff --git a/shared/bpm/CMakeLists.txt b/shared/bpm/CMakeLists.txt index 052736c7a..0f16408c7 100644 --- a/shared/bpm/CMakeLists.txt +++ b/shared/bpm/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(bpm OBJECT) add_library(OBS::bpm ALIAS bpm) diff --git a/shared/file-updater/CMakeLists.txt b/shared/file-updater/CMakeLists.txt index 015197497..5308c9960 100644 --- a/shared/file-updater/CMakeLists.txt +++ b/shared/file-updater/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(CURL REQUIRED) diff --git a/shared/happy-eyeballs/CMakeLists.txt b/shared/happy-eyeballs/CMakeLists.txt index efbb26294..9da80a180 100644 --- a/shared/happy-eyeballs/CMakeLists.txt +++ b/shared/happy-eyeballs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(happy-eyeballs OBJECT) add_library(OBS::happy-eyeballs ALIAS happy-eyeballs) diff --git a/shared/ipc-util/CMakeLists.txt b/shared/ipc-util/CMakeLists.txt index cfcdc3c71..5a4ad7a08 100644 --- a/shared/ipc-util/CMakeLists.txt +++ b/shared/ipc-util/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(ipc-util INTERFACE) add_library(OBS::ipc-util ALIAS ipc-util) diff --git a/shared/media-playback/CMakeLists.txt b/shared/media-playback/CMakeLists.txt index 5b2d4ebba..711c09b11 100644 --- a/shared/media-playback/CMakeLists.txt +++ b/shared/media-playback/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(FFmpeg REQUIRED avcodec avdevice avutil avformat) diff --git a/shared/obs-d3d8-api/CMakeLists.txt b/shared/obs-d3d8-api/CMakeLists.txt index 35546f255..e6b6acae3 100644 --- a/shared/obs-d3d8-api/CMakeLists.txt +++ b/shared/obs-d3d8-api/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(d3d8-api INTERFACE) add_library(OBS::d3d8-api ALIAS d3d8-api) diff --git a/shared/obs-hook-config/CMakeLists.txt b/shared/obs-hook-config/CMakeLists.txt index 347657cc5..148096565 100644 --- a/shared/obs-hook-config/CMakeLists.txt +++ b/shared/obs-hook-config/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(hook-config INTERFACE) add_library(OBS::hook-config ALIAS hook-config) diff --git a/shared/obs-inject-library/CMakeLists.txt b/shared/obs-inject-library/CMakeLists.txt index b80f43118..e7cf7d071 100644 --- a/shared/obs-inject-library/CMakeLists.txt +++ b/shared/obs-inject-library/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(NOT TARGET OBS::obfuscate) add_subdirectory("${CMAKE_SOURCE_DIR}/libobs" "${CMAKE_BINARY_DIR}/libobs") diff --git a/shared/obs-scripting/CMakeLists.txt b/shared/obs-scripting/CMakeLists.txt index a6892194c..c609c257b 100644 --- a/shared/obs-scripting/CMakeLists.txt +++ b/shared/obs-scripting/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(NOT ENABLE_SCRIPTING) target_disable_feature(obs-scripting "Scripting support") diff --git a/shared/obs-scripting/cmake/lua.cmake b/shared/obs-scripting/cmake/lua.cmake index f46d90b15..e7e8147e2 100644 --- a/shared/obs-scripting/cmake/lua.cmake +++ b/shared/obs-scripting/cmake/lua.cmake @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.22...3.25) - option(ENABLE_SCRIPTING_LUA "Enable Lua scripting support" ON) if(ENABLE_SCRIPTING_LUA) diff --git a/shared/obs-scripting/cmake/python.cmake b/shared/obs-scripting/cmake/python.cmake index 9696d2b0e..5ea5fda77 100644 --- a/shared/obs-scripting/cmake/python.cmake +++ b/shared/obs-scripting/cmake/python.cmake @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.22...3.25) - option(ENABLE_SCRIPTING_PYTHON "Enable Python scripting support" ON) if(ENABLE_SCRIPTING_PYTHON) diff --git a/shared/obs-scripting/obslua/CMakeLists.txt b/shared/obs-scripting/obslua/CMakeLists.txt index d579c00e9..3e617f43c 100644 --- a/shared/obs-scripting/obslua/CMakeLists.txt +++ b/shared/obs-scripting/obslua/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(POLICY CMP0078) cmake_policy(SET CMP0078 NEW) diff --git a/shared/obs-scripting/obspython/CMakeLists.txt b/shared/obs-scripting/obspython/CMakeLists.txt index 072dea920..837032f15 100644 --- a/shared/obs-scripting/obspython/CMakeLists.txt +++ b/shared/obs-scripting/obspython/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(POLICY CMP0078) cmake_policy(SET CMP0078 NEW) diff --git a/shared/obs-shared-memory-queue/CMakeLists.txt b/shared/obs-shared-memory-queue/CMakeLists.txt index 2cc7538f0..c244420cb 100644 --- a/shared/obs-shared-memory-queue/CMakeLists.txt +++ b/shared/obs-shared-memory-queue/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) if(NOT TARGET OBS::tiny-nv12-scale) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-tiny-nv12-scale" obs-tiny-nv12-scale) diff --git a/shared/obs-tiny-nv12-scale/CMakeLists.txt b/shared/obs-tiny-nv12-scale/CMakeLists.txt index 4b2524975..42f254dcd 100644 --- a/shared/obs-tiny-nv12-scale/CMakeLists.txt +++ b/shared/obs-tiny-nv12-scale/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(obs-tiny-nv12-scale INTERFACE) add_library(OBS::tiny-nv12-scale ALIAS obs-tiny-nv12-scale) diff --git a/shared/opts-parser/CMakeLists.txt b/shared/opts-parser/CMakeLists.txt index 4f74cb66d..461c6d86a 100644 --- a/shared/opts-parser/CMakeLists.txt +++ b/shared/opts-parser/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) add_library(opts-parser OBJECT) add_library(OBS::opts-parser ALIAS opts-parser) diff --git a/shared/properties-view/CMakeLists.txt b/shared/properties-view/CMakeLists.txt index 9769baa79..206455b95 100644 --- a/shared/properties-view/CMakeLists.txt +++ b/shared/properties-view/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(Qt6 REQUIRED Core Widgets) diff --git a/shared/qt/icon-label/CMakeLists.txt b/shared/qt/icon-label/CMakeLists.txt index ff16e3376..c5325d158 100644 --- a/shared/qt/icon-label/CMakeLists.txt +++ b/shared/qt/icon-label/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(Qt6 REQUIRED Core Widgets) diff --git a/shared/qt/plain-text-edit/CMakeLists.txt b/shared/qt/plain-text-edit/CMakeLists.txt index 0abe0b562..f2977487e 100644 --- a/shared/qt/plain-text-edit/CMakeLists.txt +++ b/shared/qt/plain-text-edit/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(Qt6 REQUIRED Core Widgets) diff --git a/shared/qt/slider-ignorewheel/CMakeLists.txt b/shared/qt/slider-ignorewheel/CMakeLists.txt index 92dae97fb..5058f055b 100644 --- a/shared/qt/slider-ignorewheel/CMakeLists.txt +++ b/shared/qt/slider-ignorewheel/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(Qt6 REQUIRED Core Widgets) diff --git a/shared/qt/vertical-scroll-area/CMakeLists.txt b/shared/qt/vertical-scroll-area/CMakeLists.txt index 16d301643..a68df5f30 100644 --- a/shared/qt/vertical-scroll-area/CMakeLists.txt +++ b/shared/qt/vertical-scroll-area/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(Qt6 REQUIRED Core Widgets) diff --git a/shared/qt/wrappers/CMakeLists.txt b/shared/qt/wrappers/CMakeLists.txt index e634e6f61..00b6eb2a1 100644 --- a/shared/qt/wrappers/CMakeLists.txt +++ b/shared/qt/wrappers/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) find_package(Qt6 REQUIRED Core Widgets) diff --git a/test/test-input/CMakeLists.txt b/test/test-input/CMakeLists.txt index 2e0a7f00c..75e349e35 100644 --- a/test/test-input/CMakeLists.txt +++ b/test/test-input/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22...3.25) +cmake_minimum_required(VERSION 3.28...3.30) option(ENABLE_TEST_INPUT "Build test sources" OFF)