summaryrefslogtreecommitdiff
path: root/test cases/cmake
diff options
context:
space:
mode:
authorscivision <scivision@users.noreply.github.com>2024-10-06 00:47:26 -0400
committerEli Schwartz <eschwartz93@gmail.com>2024-10-11 12:26:27 -0400
commit2291b3f27f932a7c09bd5ce28be0d5dbe4f3612f (patch)
treea11165cdb4d38c8328ff5ae4bcfc413047f55f8f /test cases/cmake
parent739683943aa8caca37343b105a0f363abf772fa9 (diff)
downloadmeson-2291b3f27f932a7c09bd5ce28be0d5dbe4f3612f.tar.gz
test: avoid need for explict CMake minimum
This mitigates maintenance burden as CMake minimum version isn't relevant for these tests. CMake >= 3.31 warns if CMake minimum version is less than 3.10. ref: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9875
Diffstat (limited to 'test cases/cmake')
-rw-r--r--test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt4
-rw-r--r--test cases/cmake/10 header only/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/11 cmake_module_path/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/12 generator expressions/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/13 system includes/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/16 threads/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/17 include path order/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/18 skip include files/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/21 shared module/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/23 cmake toolchain/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/23 cmake toolchain/subprojects/cmModFortran/CMakeLists.txt2
-rw-r--r--test cases/cmake/24 mixing languages/subprojects/cmTest/CMakeLists.txt2
-rw-r--r--test cases/cmake/25 assembler/subprojects/cmTest/CMakeLists.txt2
-rw-r--r--test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt4
-rw-r--r--test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt2
-rw-r--r--test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt2
-rw-r--r--test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt2
-rw-r--r--test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt2
19 files changed, 21 insertions, 21 deletions
diff --git a/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt
index 2197667a3..5a2589a97 100644
--- a/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod)
set (CMAKE_CXX_STANDARD 14)
@@ -12,7 +12,7 @@ target_compile_definitions(cmModLib++ PRIVATE MESON_MAGIC_FLAG=21)
target_compile_definitions(cmModLib++ INTERFACE MESON_MAGIC_FLAG=42)
# Test PCH support
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16.0")
target_precompile_headers(cmModLib++ PRIVATE "cpp_pch.hpp")
endif()
diff --git a/test cases/cmake/10 header only/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/10 header only/subprojects/cmMod/CMakeLists.txt
index e01b6e260..ba6f70111 100644
--- a/test cases/cmake/10 header only/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/10 header only/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod)
set (CMAKE_CXX_STANDARD 14)
diff --git a/test cases/cmake/11 cmake_module_path/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/11 cmake_module_path/subprojects/cmMod/CMakeLists.txt
index 88ba9bc57..b77d7a3af 100644
--- a/test cases/cmake/11 cmake_module_path/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/11 cmake_module_path/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod)
diff --git a/test cases/cmake/12 generator expressions/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/12 generator expressions/subprojects/cmMod/CMakeLists.txt
index 27b37218a..c7cd2ffc0 100644
--- a/test cases/cmake/12 generator expressions/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/12 generator expressions/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod)
set (CMAKE_CXX_STANDARD 14)
diff --git a/test cases/cmake/13 system includes/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/13 system includes/subprojects/cmMod/CMakeLists.txt
index a6b0ba40c..2557a2ae9 100644
--- a/test cases/cmake/13 system includes/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/13 system includes/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod)
set (CMAKE_CXX_STANDARD 14)
diff --git a/test cases/cmake/16 threads/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/16 threads/subprojects/cmMod/CMakeLists.txt
index 4d61b0c37..04e7bdda1 100644
--- a/test cases/cmake/16 threads/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/16 threads/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod C CXX)
set (CMAKE_CXX_STANDARD 14)
diff --git a/test cases/cmake/17 include path order/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/17 include path order/subprojects/cmMod/CMakeLists.txt
index 9a252df18..800ada9fd 100644
--- a/test cases/cmake/17 include path order/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/17 include path order/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod)
set (CMAKE_CXX_STANDARD 14)
diff --git a/test cases/cmake/18 skip include files/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/18 skip include files/subprojects/cmMod/CMakeLists.txt
index 4db01b32d..50f875246 100644
--- a/test cases/cmake/18 skip include files/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/18 skip include files/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod)
set (CMAKE_CXX_STANDARD 14)
diff --git a/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt
index 7af9e6b97..7dd11e749 100644
--- a/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod)
set(CMAKE_CXX_STANDARD 14)
diff --git a/test cases/cmake/21 shared module/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/21 shared module/subprojects/cmMod/CMakeLists.txt
index d2fcfe3ff..4770bc7b3 100644
--- a/test cases/cmake/21 shared module/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/21 shared module/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmModule)
diff --git a/test cases/cmake/23 cmake toolchain/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/23 cmake toolchain/subprojects/cmMod/CMakeLists.txt
index a00affaeb..9fc121b8b 100644
--- a/test cases/cmake/23 cmake toolchain/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/23 cmake toolchain/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod NONE)
diff --git a/test cases/cmake/23 cmake toolchain/subprojects/cmModFortran/CMakeLists.txt b/test cases/cmake/23 cmake toolchain/subprojects/cmModFortran/CMakeLists.txt
index ecf1737fc..cf84e13ef 100644
--- a/test cases/cmake/23 cmake toolchain/subprojects/cmModFortran/CMakeLists.txt
+++ b/test cases/cmake/23 cmake toolchain/subprojects/cmModFortran/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
project(cmMod NONE)
diff --git a/test cases/cmake/24 mixing languages/subprojects/cmTest/CMakeLists.txt b/test cases/cmake/24 mixing languages/subprojects/cmTest/CMakeLists.txt
index a1886115b..a25882bb3 100644
--- a/test cases/cmake/24 mixing languages/subprojects/cmTest/CMakeLists.txt
+++ b/test cases/cmake/24 mixing languages/subprojects/cmTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmTest LANGUAGES C OBJC)
diff --git a/test cases/cmake/25 assembler/subprojects/cmTest/CMakeLists.txt b/test cases/cmake/25 assembler/subprojects/cmTest/CMakeLists.txt
index bb8834dc2..f8f014747 100644
--- a/test cases/cmake/25 assembler/subprojects/cmTest/CMakeLists.txt
+++ b/test cases/cmake/25 assembler/subprojects/cmTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmTest)
diff --git a/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt
index f920576e2..2f4e31c9f 100644
--- a/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod VERSION 1.2.3)
set(CMAKE_CXX_STANDARD 14)
@@ -12,7 +12,7 @@ target_compile_definitions(cmModLib++ PRIVATE MESON_MAGIC_FLAG=21)
target_compile_definitions(cmModLib++ INTERFACE MESON_MAGIC_FLAG=42)
# Test PCH support
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16.0")
target_precompile_headers(cmModLib++ PRIVATE "cpp_pch.hpp")
endif()
diff --git a/test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt b/test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt
index 6443fcadd..51451a222 100644
--- a/test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt
+++ b/test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt
@@ -1,2 +1,2 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmModDummy)
diff --git a/test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt b/test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt
index 497beb95e..442fc4eb6 100644
--- a/test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt
+++ b/test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt
@@ -1,2 +1,2 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmModBoth)
diff --git a/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt
index d738d45c9..d31a6a294 100644
--- a/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod)
set(CMAKE_CXX_STANDARD 14)
diff --git a/test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt
index a5da5e7d2..65c725b25 100644
--- a/test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmMod)
set (CMAKE_CXX_STANDARD 14)