From 6d6a10dff46403b8c3ab043101dc90d39034ff47 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 22 Sep 2021 16:17:39 +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: I1191a6b4b5c13b2b6047a0e2a2ff8c3801f6762b Reviewed-by: Qt CI Bot Reviewed-by: Kai Koehne --- CMakeLists.txt | 2 +- examples/assistant/remotecontrol/CMakeLists.txt | 2 +- examples/assistant/simpletextviewer/CMakeLists.txt | 2 +- examples/designer/calculatorbuilder/CMakeLists.txt | 2 +- examples/designer/calculatorform/CMakeLists.txt | 2 +- examples/designer/containerextension/CMakeLists.txt | 2 +- examples/designer/customwidgetplugin/CMakeLists.txt | 2 +- examples/designer/taskmenuextension/CMakeLists.txt | 2 +- examples/designer/worldtimeclockbuilder/CMakeLists.txt | 2 +- examples/designer/worldtimeclockplugin/CMakeLists.txt | 2 +- examples/help/contextsensitivehelp/CMakeLists.txt | 2 +- examples/linguist/arrowpad/CMakeLists.txt | 2 +- examples/linguist/hellotr/CMakeLists.txt | 2 +- examples/linguist/trollprint/CMakeLists.txt | 2 +- examples/uitools/multipleinheritance/CMakeLists.txt | 2 +- examples/uitools/textfinder/CMakeLists.txt | 2 +- tests/auto/cmake/CMakeLists.txt | 2 +- tests/auto/cmake/linguist/CMakeLists.txt | 2 +- tests/auto/cmake/linguist/test_add_translation_macro/CMakeLists.txt | 2 +- tests/auto/cmake/linguist/test_create_translation_macro/CMakeLists.txt | 2 +- tests/auto/cmake/test_translation_api/CMakeLists.txt | 2 +- tests/auto/cmake/test_uiplugin_module/CMakeLists.txt | 2 +- tests/auto/cmake/test_uiplugin_via_designer/CMakeLists.txt | 2 +- tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/CMakeLists.txt | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8af1b88b5..b088ee8b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from qttools.pro. -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.16) include(.cmake.conf) project(QtTools # special case diff --git a/examples/assistant/remotecontrol/CMakeLists.txt b/examples/assistant/remotecontrol/CMakeLists.txt index 6f80e0478..c8b3b5c91 100644 --- a/examples/assistant/remotecontrol/CMakeLists.txt +++ b/examples/assistant/remotecontrol/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from remotecontrol.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(remotecontrol LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/assistant/simpletextviewer/CMakeLists.txt b/examples/assistant/simpletextviewer/CMakeLists.txt index 734006256..fb4f100be 100644 --- a/examples/assistant/simpletextviewer/CMakeLists.txt +++ b/examples/assistant/simpletextviewer/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from simpletextviewer.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(simpletextviewer LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/designer/calculatorbuilder/CMakeLists.txt b/examples/designer/calculatorbuilder/CMakeLists.txt index 2cb01e947..dc1d9de5b 100644 --- a/examples/designer/calculatorbuilder/CMakeLists.txt +++ b/examples/designer/calculatorbuilder/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from calculatorbuilder.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(calculatorbuilder LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/designer/calculatorform/CMakeLists.txt b/examples/designer/calculatorform/CMakeLists.txt index ad721d0cc..7034d6b17 100644 --- a/examples/designer/calculatorform/CMakeLists.txt +++ b/examples/designer/calculatorform/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from calculatorform.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(calculatorform LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/designer/containerextension/CMakeLists.txt b/examples/designer/containerextension/CMakeLists.txt index 1a6a0f61b..efc0e8ef7 100644 --- a/examples/designer/containerextension/CMakeLists.txt +++ b/examples/designer/containerextension/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from containerextension.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(containerextension LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/designer/customwidgetplugin/CMakeLists.txt b/examples/designer/customwidgetplugin/CMakeLists.txt index 764fe7373..ca2b0448b 100644 --- a/examples/designer/customwidgetplugin/CMakeLists.txt +++ b/examples/designer/customwidgetplugin/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from customwidgetplugin.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(customwidgetplugin LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/designer/taskmenuextension/CMakeLists.txt b/examples/designer/taskmenuextension/CMakeLists.txt index a91b58eac..eb565d600 100644 --- a/examples/designer/taskmenuextension/CMakeLists.txt +++ b/examples/designer/taskmenuextension/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from taskmenuextension.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(taskmenuextension LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/designer/worldtimeclockbuilder/CMakeLists.txt b/examples/designer/worldtimeclockbuilder/CMakeLists.txt index 2c93155c7..b435dba0d 100644 --- a/examples/designer/worldtimeclockbuilder/CMakeLists.txt +++ b/examples/designer/worldtimeclockbuilder/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from worldtimeclockbuilder.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(worldtimeclockbuilder LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/designer/worldtimeclockplugin/CMakeLists.txt b/examples/designer/worldtimeclockplugin/CMakeLists.txt index 6e675fc9b..3cecd4b6d 100644 --- a/examples/designer/worldtimeclockplugin/CMakeLists.txt +++ b/examples/designer/worldtimeclockplugin/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from worldtimeclockplugin.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(worldtimeclockplugin LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/help/contextsensitivehelp/CMakeLists.txt b/examples/help/contextsensitivehelp/CMakeLists.txt index 40d89a3e4..f1b8808f0 100644 --- a/examples/help/contextsensitivehelp/CMakeLists.txt +++ b/examples/help/contextsensitivehelp/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from contextsensitivehelp.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(contextsensitivehelp LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/linguist/arrowpad/CMakeLists.txt b/examples/linguist/arrowpad/CMakeLists.txt index cf652c8f2..94b003262 100644 --- a/examples/linguist/arrowpad/CMakeLists.txt +++ b/examples/linguist/arrowpad/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from arrowpad.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(arrowpad LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/linguist/hellotr/CMakeLists.txt b/examples/linguist/hellotr/CMakeLists.txt index c9c65ac6c..74cb0e05a 100644 --- a/examples/linguist/hellotr/CMakeLists.txt +++ b/examples/linguist/hellotr/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from hellotr.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(hellotr LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/linguist/trollprint/CMakeLists.txt b/examples/linguist/trollprint/CMakeLists.txt index e1c953cdf..bb378111f 100644 --- a/examples/linguist/trollprint/CMakeLists.txt +++ b/examples/linguist/trollprint/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from trollprint.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(trollprint LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/uitools/multipleinheritance/CMakeLists.txt b/examples/uitools/multipleinheritance/CMakeLists.txt index 7a942d53a..59c240144 100644 --- a/examples/uitools/multipleinheritance/CMakeLists.txt +++ b/examples/uitools/multipleinheritance/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from multipleinheritance.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(multipleinheritance LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/uitools/textfinder/CMakeLists.txt b/examples/uitools/textfinder/CMakeLists.txt index 84fbd72c4..96911c675 100644 --- a/examples/uitools/textfinder/CMakeLists.txt +++ b/examples/uitools/textfinder/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from textfinder.pro. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(textfinder LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 77641e8b0..4ea9f882f 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -21,7 +21,7 @@ # needs to be set to the installation prefix or build prefix of Qt # before running these tests. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(qttools_cmake_tests) diff --git a/tests/auto/cmake/linguist/CMakeLists.txt b/tests/auto/cmake/linguist/CMakeLists.txt index 354c80e3b..e137478c1 100644 --- a/tests/auto/cmake/linguist/CMakeLists.txt +++ b/tests/auto/cmake/linguist/CMakeLists.txt @@ -20,7 +20,7 @@ # needs to be set to the installation prefix or build prefix of Qt # before running these tests. -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(qttools_cmake_tests_linguist) diff --git a/tests/auto/cmake/linguist/test_add_translation_macro/CMakeLists.txt b/tests/auto/cmake/linguist/test_add_translation_macro/CMakeLists.txt index becfecaea..6a51231b1 100644 --- a/tests/auto/cmake/linguist/test_add_translation_macro/CMakeLists.txt +++ b/tests/auto/cmake/linguist/test_add_translation_macro/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.16) project(test_add_translation_macro) diff --git a/tests/auto/cmake/linguist/test_create_translation_macro/CMakeLists.txt b/tests/auto/cmake/linguist/test_create_translation_macro/CMakeLists.txt index 0dff13711..163d21793 100644 --- a/tests/auto/cmake/linguist/test_create_translation_macro/CMakeLists.txt +++ b/tests/auto/cmake/linguist/test_create_translation_macro/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.16) project(test_create_translation_macros) diff --git a/tests/auto/cmake/test_translation_api/CMakeLists.txt b/tests/auto/cmake/test_translation_api/CMakeLists.txt index 81321a067..9d1394566 100644 --- a/tests/auto/cmake/test_translation_api/CMakeLists.txt +++ b/tests/auto/cmake/test_translation_api/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.16) project(test_update_translation_macro) diff --git a/tests/auto/cmake/test_uiplugin_module/CMakeLists.txt b/tests/auto/cmake/test_uiplugin_module/CMakeLists.txt index 2c1998840..81c692f96 100644 --- a/tests/auto/cmake/test_uiplugin_module/CMakeLists.txt +++ b/tests/auto/cmake/test_uiplugin_module/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.16) project(test_uiplugin_module) find_package(Qt6 COMPONENTS Widgets UiPlugin REQUIRED) diff --git a/tests/auto/cmake/test_uiplugin_via_designer/CMakeLists.txt b/tests/auto/cmake/test_uiplugin_via_designer/CMakeLists.txt index fc1fe6c61..70901823b 100644 --- a/tests/auto/cmake/test_uiplugin_via_designer/CMakeLists.txt +++ b/tests/auto/cmake/test_uiplugin_via_designer/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.16) project(test_uiplugin_via_designer) find_package(Qt6 COMPONENTS Widgets Xml Designer REQUIRED) diff --git a/tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/CMakeLists.txt b/tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/CMakeLists.txt index c6a5c654b..89eafa300 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/CMakeLists.txt +++ b/tests/auto/qdoc/generatedoutput/testdata/qml/cmaketest/CMakeLists.txt @@ -1,2 +1,2 @@ -cmake_minimum_required (VERSION 2.8.11) +cmake_minimum_required(VERSION 3.16) project (QDOCTEST) -- cgit v1.2.3