From 232e893785553796b2016b4440a7f3776ed450a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sun, 5 Jan 2025 23:19:26 +0100 Subject: [PATCH] Downgrade required CMake to 3.16 We still want to build VS 2017 through AppVeyor, and those images have CMake 3.16.2 installed. We could install newer CMake as part of the build, but since we don't use newer CMake features yet, this is simpler. --- .conan/test_package/CMakeLists.txt | 2 +- CMakeLists.txt | 2 +- docs/cmake-integration.md | 4 ++-- examples/CMakeLists.txt | 2 +- tests/ExtraTests/CMakeLists.txt | 2 +- tests/TestScripts/DiscoverTests/CMakeLists.txt | 2 +- tools/misc/CMakeLists.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.conan/test_package/CMakeLists.txt b/.conan/test_package/CMakeLists.txt index 9a28bd5d8c..f067457f72 100644 --- a/.conan/test_package/CMakeLists.txt +++ b/.conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.16) project(PackageTest CXX) find_package(Catch2 CONFIG REQUIRED) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8df72e7be4..c577231cb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.16) # detect if Catch is being bundled, # disable testsuite in that case diff --git a/docs/cmake-integration.md b/docs/cmake-integration.md index daeb5f7577..cfb9853da8 100644 --- a/docs/cmake-integration.md +++ b/docs/cmake-integration.md @@ -85,7 +85,7 @@ a target. This function works by running the resulting executable with #### Usage ```cmake -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.16) project(baz LANGUAGES CXX VERSION 0.0.1) @@ -239,7 +239,7 @@ parsed are *silently ignored*. #### Usage ```cmake -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.16) project(baz LANGUAGES CXX VERSION 0.0.1) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 6dcb762375..d45ddfcb6a 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 3.20 ) +cmake_minimum_required( VERSION 3.16 ) project( Catch2Examples LANGUAGES CXX ) diff --git a/tests/ExtraTests/CMakeLists.txt b/tests/ExtraTests/CMakeLists.txt index 82e71ea6cb..3c38d67577 100644 --- a/tests/ExtraTests/CMakeLists.txt +++ b/tests/ExtraTests/CMakeLists.txt @@ -2,7 +2,7 @@ # Build extra tests. # -cmake_minimum_required( VERSION 3.20 ) +cmake_minimum_required( VERSION 3.16 ) project( Catch2ExtraTests LANGUAGES CXX ) diff --git a/tests/TestScripts/DiscoverTests/CMakeLists.txt b/tests/TestScripts/DiscoverTests/CMakeLists.txt index 64eb251f63..f0b49f4de7 100644 --- a/tests/TestScripts/DiscoverTests/CMakeLists.txt +++ b/tests/TestScripts/DiscoverTests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.16) project(discover-tests-test LANGUAGES CXX diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt index 0091ae6f18..59811dfe50 100644 --- a/tools/misc/CMakeLists.txt +++ b/tools/misc/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.16) project(CatchCoverageHelper)