From 68a1bde401e5e20d5ac800cc2ff435b28c57caad Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 22 Sep 2021 15:54:34 +0200 Subject: 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: I5d8b0e42bd149e5f88326baa4b1f28a5f37e4ec2 Reviewed-by: Qt CI Bot Reviewed-by: Kai Koehne --- examples/activeqt/comapp/CMakeLists.txt | 2 +- examples/activeqt/hierarchy/CMakeLists.txt | 2 +- examples/activeqt/mediaplayer/CMakeLists.txt | 2 +- examples/activeqt/menus/CMakeLists.txt | 2 +- examples/activeqt/multiple/CMakeLists.txt | 2 +- examples/activeqt/opengl/CMakeLists.txt | 2 +- examples/activeqt/qutlook/CMakeLists.txt | 2 +- examples/activeqt/simple/CMakeLists.txt | 2 +- examples/activeqt/simpleqml/CMakeLists.txt | 2 +- examples/activeqt/wrapper/CMakeLists.txt | 2 +- tests/auto/cmake/CMakeLists.txt | 2 +- tests/auto/cmake/test_modules/container/CMakeLists.txt | 2 +- tests/auto/cmake/test_modules/server/CMakeLists.txt | 2 +- tests/auto/cmake/test_target_typelibs/CMakeLists.txt | 2 +- tests/auto/cmake/test_target_typelibs_absolute/CMakeLists.txt | 2 +- tests/auto/cmake/test_target_typelibs_empty_libs/CMakeLists.txt | 2 +- tests/auto/cmake/test_target_typelibs_non_existing_libs/CMakeLists.txt | 2 +- tests/auto/cmake/test_target_typelibs_out_dir/CMakeLists.txt | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/activeqt/comapp/CMakeLists.txt b/examples/activeqt/comapp/CMakeLists.txt index 87f180d..0434c4c 100644 --- a/examples/activeqt/comapp/CMakeLists.txt +++ b/examples/activeqt/comapp/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from comapp.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(comapp LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/activeqt/hierarchy/CMakeLists.txt b/examples/activeqt/hierarchy/CMakeLists.txt index 5dca02b..35067ab 100644 --- a/examples/activeqt/hierarchy/CMakeLists.txt +++ b/examples/activeqt/hierarchy/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from hierarchy.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(hierarchyax LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/activeqt/mediaplayer/CMakeLists.txt b/examples/activeqt/mediaplayer/CMakeLists.txt index 9b5210d..3f9f3aa 100644 --- a/examples/activeqt/mediaplayer/CMakeLists.txt +++ b/examples/activeqt/mediaplayer/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(mediaplayer_activeqt LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/activeqt/menus/CMakeLists.txt b/examples/activeqt/menus/CMakeLists.txt index 9b092f5..135f2ad 100644 --- a/examples/activeqt/menus/CMakeLists.txt +++ b/examples/activeqt/menus/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from menus.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(menusax LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/activeqt/multiple/CMakeLists.txt b/examples/activeqt/multiple/CMakeLists.txt index b318d0b..47759e7 100644 --- a/examples/activeqt/multiple/CMakeLists.txt +++ b/examples/activeqt/multiple/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from multiple.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(multipleax LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/activeqt/opengl/CMakeLists.txt b/examples/activeqt/opengl/CMakeLists.txt index 1572de3..0be0978 100644 --- a/examples/activeqt/opengl/CMakeLists.txt +++ b/examples/activeqt/opengl/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from opengl.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(openglax LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/activeqt/qutlook/CMakeLists.txt b/examples/activeqt/qutlook/CMakeLists.txt index 6994f37..e335f7e 100644 --- a/examples/activeqt/qutlook/CMakeLists.txt +++ b/examples/activeqt/qutlook/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from qutlook.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(qutlook LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/activeqt/simple/CMakeLists.txt b/examples/activeqt/simple/CMakeLists.txt index 283edc6..1bc4f9c 100644 --- a/examples/activeqt/simple/CMakeLists.txt +++ b/examples/activeqt/simple/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from simple.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(simpleax LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/activeqt/simpleqml/CMakeLists.txt b/examples/activeqt/simpleqml/CMakeLists.txt index 8faa39f..c26c956 100644 --- a/examples/activeqt/simpleqml/CMakeLists.txt +++ b/examples/activeqt/simpleqml/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from simpleqml.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(simpleqmlax LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/activeqt/wrapper/CMakeLists.txt b/examples/activeqt/wrapper/CMakeLists.txt index d9cbb78..5b17989 100644 --- a/examples/activeqt/wrapper/CMakeLists.txt +++ b/examples/activeqt/wrapper/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from wrapper.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(wrapperax LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 8be2a8b..056c867 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(qtactivetqt_cmake_tests) diff --git a/tests/auto/cmake/test_modules/container/CMakeLists.txt b/tests/auto/cmake/test_modules/container/CMakeLists.txt index 124e065..28cb00b 100644 --- a/tests/auto/cmake/test_modules/container/CMakeLists.txt +++ b/tests/auto/cmake/test_modules/container/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(cmake_axcontainer) diff --git a/tests/auto/cmake/test_modules/server/CMakeLists.txt b/tests/auto/cmake/test_modules/server/CMakeLists.txt index 255b13d..7a222a8 100644 --- a/tests/auto/cmake/test_modules/server/CMakeLists.txt +++ b/tests/auto/cmake/test_modules/server/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(cmake_axserver) diff --git a/tests/auto/cmake/test_target_typelibs/CMakeLists.txt b/tests/auto/cmake/test_target_typelibs/CMakeLists.txt index 44ce88f..f6d7028 100644 --- a/tests/auto/cmake/test_target_typelibs/CMakeLists.txt +++ b/tests/auto/cmake/test_target_typelibs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(tst_typelibs) find_package(Qt6 COMPONENTS AxContainer Gui Widgets CONFIG REQUIRED) diff --git a/tests/auto/cmake/test_target_typelibs_absolute/CMakeLists.txt b/tests/auto/cmake/test_target_typelibs_absolute/CMakeLists.txt index f8455fa..8d198a4 100644 --- a/tests/auto/cmake/test_target_typelibs_absolute/CMakeLists.txt +++ b/tests/auto/cmake/test_target_typelibs_absolute/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(tst_typelibs) find_package(Qt6 COMPONENTS AxContainer Gui Widgets CONFIG REQUIRED) diff --git a/tests/auto/cmake/test_target_typelibs_empty_libs/CMakeLists.txt b/tests/auto/cmake/test_target_typelibs_empty_libs/CMakeLists.txt index 1bbeed7..ba2c1d2 100644 --- a/tests/auto/cmake/test_target_typelibs_empty_libs/CMakeLists.txt +++ b/tests/auto/cmake/test_target_typelibs_empty_libs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(tst_typelibs) find_package(Qt6 COMPONENTS AxContainer Gui Widgets CONFIG REQUIRED) diff --git a/tests/auto/cmake/test_target_typelibs_non_existing_libs/CMakeLists.txt b/tests/auto/cmake/test_target_typelibs_non_existing_libs/CMakeLists.txt index 448732a..15a2a1d 100644 --- a/tests/auto/cmake/test_target_typelibs_non_existing_libs/CMakeLists.txt +++ b/tests/auto/cmake/test_target_typelibs_non_existing_libs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(tst_typelibs) find_package(Qt6 COMPONENTS AxContainer Gui Widgets CONFIG REQUIRED) diff --git a/tests/auto/cmake/test_target_typelibs_out_dir/CMakeLists.txt b/tests/auto/cmake/test_target_typelibs_out_dir/CMakeLists.txt index 66e753e..2c92d44 100644 --- a/tests/auto/cmake/test_target_typelibs_out_dir/CMakeLists.txt +++ b/tests/auto/cmake/test_target_typelibs_out_dir/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(tst_typelibs) find_package(Qt6 COMPONENTS AxContainer Gui Widgets CONFIG REQUIRED) -- cgit v1.2.3