feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Change wizards to use find_package(... REQUIRED COMPONENTS) idiom

Browse Source 
Task-number: QTBUG-98867
Change-Id: I7812898c411d5366d1d2452f01bd856d194fde84
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Kai Köhne
2021-12-09 13:42:30 +01:00
committed by Kai Koehne
parent 8039aa9ddb
commit b098b8ffe4
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
share/qtcreator/templates/wizards/autotest/files/tst.txt
View File

@@ -6,11 +6,11 @@ enable_testing()
@if "%{TestFrameWork}" == "QtTest" @if "%{TestFrameWork}" == "QtTest"
@if "%{RequireGUI}" == "true" @if "%{RequireGUI}" == "true"
find_package(QT NAMES Qt6 Qt5 COMPONENTS Gui Test REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Gui Test)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui Test REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Test)
@else @else
find_package(QT NAMES Qt6 Qt5 COMPONENTS Test REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Test)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Test REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test)
@endif @endif
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -33,8 +33,8 @@ target_link_libraries(%{TestCaseName} PRIVATE Qt${QT_VERSION_MAJOR}::Test)
@endif @endif
@if "%{TestFrameWork}" == "QtQuickTest" @if "%{TestFrameWork}" == "QtQuickTest"
find_package(QT NAMES Qt6 Qt5 COMPONENTS QuickTest REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS QuickTest)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS QuickTest REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS QuickTest)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -124,8 +124,8 @@ endif ()
SET(CMAKE_CXX_STANDARD 11) SET(CMAKE_CXX_STANDARD 11)
@if "%{Catch2NeedsQt}" == "true" @if "%{Catch2NeedsQt}" == "true"
find_package(QT NAMES Qt6 Qt5 COMPONENTS Gui REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Gui)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui)
@endif @endif
add_executable(${PROJECT_NAME} %{TestCaseFileWithCppSuffix} main.cpp) add_executable(${PROJECT_NAME} %{TestCaseFileWithCppSuffix} main.cpp)

8
share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt
View File

@@ -12,13 +12,13 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@if %{HasTranslation} @if %{HasTranslation}
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core LinguistTools REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core LinguistTools)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core LinguistTools REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core LinguistTools)
set(TS_FILES %{TsFileName}) set(TS_FILES %{TsFileName})
@else @else
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
@endif @endif
add_executable(%{ProjectName} add_executable(%{ProjectName}

8
share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt
View File

@@ -13,13 +13,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
@if '%{QtModule}' != 'none' @if '%{QtModule}' != 'none'
@if %{HasTranslation} @if %{HasTranslation}
find_package(QT NAMES Qt6 Qt5 COMPONENTS %{QtModuleUpperCase} LinguistTools REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS %{QtModuleUpperCase} LinguistTools)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS %{QtModuleUpperCase} LinguistTools REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS %{QtModuleUpperCase} LinguistTools)
set(TS_FILES %{TsFileName}) set(TS_FILES %{TsFileName})
@else @else
find_package(QT NAMES Qt6 Qt5 COMPONENTS %{QtModuleUpperCase} REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS %{QtModuleUpperCase})
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS %{QtModuleUpperCase} REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS %{QtModuleUpperCase})
@endif @endif
@endif @endif

8
share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt
View File

@@ -12,13 +12,13 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@if %{HasTranslation} @if %{HasTranslation}
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick LinguistTools REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick LinguistTools)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick LinguistTools REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick LinguistTools)
set(TS_FILES %{TsFileName}) set(TS_FILES %{TsFileName})
@else @else
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick)
@endif @endif
set(PROJECT_SOURCES set(PROJECT_SOURCES

8
share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt
View File

@@ -12,13 +12,13 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@if %{HasTranslation} @if %{HasTranslation}
find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets LinguistTools REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets LinguistTools)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets LinguistTools REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools)
set(TS_FILES %{TsFileName}) set(TS_FILES %{TsFileName})
@else @else
find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
@endif @endif
set(PROJECT_SOURCES set(PROJECT_SOURCES

4
share/qtcreator/templates/wizards/qtcreatorplugin/CMakeLists.txt
View File

@@ -18,8 +18,8 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
find_package(QtCreator COMPONENTS Core REQUIRED) find_package(QtCreator REQUIRED COMPONENTS Core)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
set(QtX Qt${QT_VERSION_MAJOR}) set(QtX Qt${QT_VERSION_MAJOR})
add_qtc_plugin(%{PluginName} add_qtc_plugin(%{PluginName}