From 41a915db9e17ee20c7edec0b8defa5533dcdf0c9 Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Thu, 3 Aug 2023 19:22:24 -0400 Subject: [PATCH] deps: Update CMake minimum to 3.22 Since Ubuntu 22.04 is now our minimum supported Ubuntu version, and it has CMake 3.22, let's make CMake 3.22 the minimum CMake version. --- deps/blake2/CMakeLists.txt | 2 +- deps/file-updater/CMakeLists.txt | 2 +- deps/glad/CMakeLists.txt | 2 +- deps/happy-eyeballs/CMakeLists.txt | 2 +- deps/json11/CMakeLists.txt | 2 +- deps/libcaption/CMakeLists.txt | 2 +- deps/media-playback/CMakeLists.txt | 2 +- deps/obs-scripting/CMakeLists.txt | 2 +- deps/obs-scripting/obslua/CMakeLists.txt | 2 +- deps/obs-scripting/obspython/CMakeLists.txt | 2 +- deps/opts-parser/CMakeLists.txt | 2 +- deps/uthash/CMakeLists.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deps/blake2/CMakeLists.txt b/deps/blake2/CMakeLists.txt index dbdc9cbb4..b9fb338a8 100644 --- a/deps/blake2/CMakeLists.txt +++ b/deps/blake2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) add_library(blake2 STATIC EXCLUDE_FROM_ALL ) add_library(OBS::blake2 ALIAS blake2) diff --git a/deps/file-updater/CMakeLists.txt b/deps/file-updater/CMakeLists.txt index 687ce3ca6..e07cd2f0f 100644 --- a/deps/file-updater/CMakeLists.txt +++ b/deps/file-updater/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) find_package(CURL REQUIRED) diff --git a/deps/glad/CMakeLists.txt b/deps/glad/CMakeLists.txt index 85c57de41..64b05a2cc 100644 --- a/deps/glad/CMakeLists.txt +++ b/deps/glad/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) find_package(OpenGL REQUIRED) diff --git a/deps/happy-eyeballs/CMakeLists.txt b/deps/happy-eyeballs/CMakeLists.txt index cc7a7a1b1..b3a5692cd 100644 --- a/deps/happy-eyeballs/CMakeLists.txt +++ b/deps/happy-eyeballs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) add_library(happy-eyeballs INTERFACE) add_library(OBS::happy-eyeballs ALIAS happy-eyeballs) diff --git a/deps/json11/CMakeLists.txt b/deps/json11/CMakeLists.txt index 5971da7ee..510630f4f 100644 --- a/deps/json11/CMakeLists.txt +++ b/deps/json11/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) add_library(json11 INTERFACE) add_library(OBS::json11 ALIAS json11) diff --git a/deps/libcaption/CMakeLists.txt b/deps/libcaption/CMakeLists.txt index 567537277..53cd79196 100644 --- a/deps/libcaption/CMakeLists.txt +++ b/deps/libcaption/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) add_library(caption STATIC EXCLUDE_FROM_ALL ) add_library(OBS::caption ALIAS caption) diff --git a/deps/media-playback/CMakeLists.txt b/deps/media-playback/CMakeLists.txt index e2e28a8bb..a84900e47 100644 --- a/deps/media-playback/CMakeLists.txt +++ b/deps/media-playback/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) find_package(FFmpeg REQUIRED COMPONENTS avcodec avdevice avutil avformat) diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt index e437b27cf..9096e4b27 100644 --- a/deps/obs-scripting/CMakeLists.txt +++ b/deps/obs-scripting/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) legacy_check() diff --git a/deps/obs-scripting/obslua/CMakeLists.txt b/deps/obs-scripting/obslua/CMakeLists.txt index 547037984..98517ee7d 100644 --- a/deps/obs-scripting/obslua/CMakeLists.txt +++ b/deps/obs-scripting/obslua/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) legacy_check() diff --git a/deps/obs-scripting/obspython/CMakeLists.txt b/deps/obs-scripting/obspython/CMakeLists.txt index f38c4b539..f0db72f75 100644 --- a/deps/obs-scripting/obspython/CMakeLists.txt +++ b/deps/obs-scripting/obspython/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) legacy_check() diff --git a/deps/opts-parser/CMakeLists.txt b/deps/opts-parser/CMakeLists.txt index 793c2ad1d..a87ee641e 100644 --- a/deps/opts-parser/CMakeLists.txt +++ b/deps/opts-parser/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) add_library(opts-parser INTERFACE) add_library(OBS::opts-parser ALIAS opts-parser) diff --git a/deps/uthash/CMakeLists.txt b/deps/uthash/CMakeLists.txt index 19f262a36..aecb0d74e 100644 --- a/deps/uthash/CMakeLists.txt +++ b/deps/uthash/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.25) +cmake_minimum_required(VERSION 3.22...3.25) add_library(uthash INTERFACE) add_library(OBS::uthash ALIAS uthash)