From b098b8ffe4ef9273ca24012d9c45cbb164d9b4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Thu, 9 Dec 2021 13:42:30 +0100 Subject: [PATCH] Change wizards to use find_package(... REQUIRED COMPONENTS) idiom Task-number: QTBUG-98867 Change-Id: I7812898c411d5366d1d2452f01bd856d194fde84 Reviewed-by: Cristian Adam --- .../templates/wizards/autotest/files/tst.txt | 16 ++++++++-------- .../wizards/projects/consoleapp/CMakeLists.txt | 8 ++++---- .../wizards/projects/cpplibrary/CMakeLists.txt | 8 ++++---- .../projects/qtquickapplication/CMakeLists.txt | 8 ++++---- .../projects/qtwidgetsapplication/CMakeLists.txt | 8 ++++---- .../wizards/qtcreatorplugin/CMakeLists.txt | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/share/qtcreator/templates/wizards/autotest/files/tst.txt b/share/qtcreator/templates/wizards/autotest/files/tst.txt index 7eb0985b745..f27ac0e9cca 100644 --- a/share/qtcreator/templates/wizards/autotest/files/tst.txt +++ b/share/qtcreator/templates/wizards/autotest/files/tst.txt @@ -6,11 +6,11 @@ enable_testing() @if "%{TestFrameWork}" == "QtTest" @if "%{RequireGUI}" == "true" -find_package(QT NAMES Qt6 Qt5 COMPONENTS Gui Test REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui Test REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Gui Test) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Test) @else -find_package(QT NAMES Qt6 Qt5 COMPONENTS Test REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Test REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Test) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test) @endif set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -33,8 +33,8 @@ target_link_libraries(%{TestCaseName} PRIVATE Qt${QT_VERSION_MAJOR}::Test) @endif @if "%{TestFrameWork}" == "QtQuickTest" -find_package(QT NAMES Qt6 Qt5 COMPONENTS QuickTest REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS QuickTest REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS QuickTest) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS QuickTest) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -124,8 +124,8 @@ endif () SET(CMAKE_CXX_STANDARD 11) @if "%{Catch2NeedsQt}" == "true" -find_package(QT NAMES Qt6 Qt5 COMPONENTS Gui REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Gui) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui) @endif add_executable(${PROJECT_NAME} %{TestCaseFileWithCppSuffix} main.cpp) diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt index b0de6b947c5..51fcdeb2a79 100644 --- a/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt @@ -12,13 +12,13 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) @if %{HasTranslation} -find_package(QT NAMES Qt6 Qt5 COMPONENTS Core LinguistTools REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core LinguistTools REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core LinguistTools) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core LinguistTools) set(TS_FILES %{TsFileName}) @else -find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core) @endif add_executable(%{ProjectName} diff --git a/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt index f84cf90b29a..9d105a8fe52 100644 --- a/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt @@ -13,13 +13,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) @if '%{QtModule}' != 'none' @if %{HasTranslation} -find_package(QT NAMES Qt6 Qt5 COMPONENTS %{QtModuleUpperCase} LinguistTools REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS %{QtModuleUpperCase} LinguistTools REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS %{QtModuleUpperCase} LinguistTools) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS %{QtModuleUpperCase} LinguistTools) set(TS_FILES %{TsFileName}) @else -find_package(QT NAMES Qt6 Qt5 COMPONENTS %{QtModuleUpperCase} REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS %{QtModuleUpperCase} REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS %{QtModuleUpperCase}) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS %{QtModuleUpperCase}) @endif @endif diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt index 99afd833069..547bc2f5c06 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt @@ -12,13 +12,13 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) @if %{HasTranslation} -find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick LinguistTools REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick LinguistTools REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick LinguistTools) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick LinguistTools) set(TS_FILES %{TsFileName}) @else -find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick) @endif set(PROJECT_SOURCES diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt index 33dc1fd6f07..32b674fa4ad 100644 --- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt @@ -12,13 +12,13 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) @if %{HasTranslation} -find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets LinguistTools REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets LinguistTools REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets LinguistTools) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools) set(TS_FILES %{TsFileName}) @else -find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) @endif set(PROJECT_SOURCES diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/CMakeLists.txt b/share/qtcreator/templates/wizards/qtcreatorplugin/CMakeLists.txt index b27b902e028..48884eae644 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/CMakeLists.txt @@ -18,8 +18,8 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_CXX_STANDARD 17) -find_package(QtCreator COMPONENTS Core REQUIRED) -find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED) +find_package(QtCreator REQUIRED COMPONENTS Core) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets) set(QtX Qt${QT_VERSION_MAJOR}) add_qtc_plugin(%{PluginName}