summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-09-22 16:23:03 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2021-09-22 19:37:15 +0200
commit5a2ebe329c1cce662d535dd652c8982c0c514ccb (patch)
tree6203509297d4ab415f88c1a0bbf769e499547ce1
parentd9145878259e7b5dce0df3fb3566ec00fcb4ed57 (diff)
downloadqtwayland-5a2ebe329c1cce662d535dd652c8982c0c514ccb.tar.gz
CMake: Bump almost all cmake_minimum_required calls to 3.16
Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: I43575e48cb4ddb70b80f09e0432a2f88b01bec86 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--CMakeLists.txt2
-rw-r--r--config.tests/wayland_scanner/CMakeLists.txt2
-rw-r--r--tests/auto/cmake/CMakeLists.txt2
-rw-r--r--tests/auto/cmake/test_waylandclient/CMakeLists.txt2
-rw-r--r--tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt2
-rw-r--r--tests/manual/texture-sharing-2/qml-client/CMakeLists.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 440a66b6..c03bf628 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from qtwayland.pro.
-cmake_minimum_required(VERSION 3.15.0)
+cmake_minimum_required(VERSION 3.16)
include(.cmake.conf)
project(QtWayland # special case
diff --git a/config.tests/wayland_scanner/CMakeLists.txt b/config.tests/wayland_scanner/CMakeLists.txt
index b0286da4..f531b01c 100644
--- a/config.tests/wayland_scanner/CMakeLists.txt
+++ b/config.tests/wayland_scanner/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from wayland_scanner.pro.
-cmake_minimum_required(VERSION 3.14.0)
+cmake_minimum_required(VERSION 3.16)
project(config_test_wayland_scanner LANGUAGES C CXX)
foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 270d11aa..53fc6b2a 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.16)
project(qmake_cmake_files)
diff --git a/tests/auto/cmake/test_waylandclient/CMakeLists.txt b/tests/auto/cmake/test_waylandclient/CMakeLists.txt
index 3788a492..d3dacc0f 100644
--- a/tests/auto/cmake/test_waylandclient/CMakeLists.txt
+++ b/tests/auto/cmake/test_waylandclient/CMakeLists.txt
@@ -1,6 +1,6 @@
project(test_plugins)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.16)
cmake_policy(SET CMP0056 NEW)
find_package(Qt5WaylandClient REQUIRED)
diff --git a/tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt b/tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt
index 0ca81f26..c8d9839c 100644
--- a/tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt
+++ b/tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from custom-compositor.pro.
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.16)
project(texture-sharing-custom-compositor LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
diff --git a/tests/manual/texture-sharing-2/qml-client/CMakeLists.txt b/tests/manual/texture-sharing-2/qml-client/CMakeLists.txt
index 76161a78..dc88cb30 100644
--- a/tests/manual/texture-sharing-2/qml-client/CMakeLists.txt
+++ b/tests/manual/texture-sharing-2/qml-client/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from qml-client.pro.
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.16)
project(qml-client LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON)