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

Wizards: Update CMakeLists.txt files to handle Qt 6 and Qt 5

Browse Source 
Update wizards to produce CMakeLists.txt files that can work with both
Qt 5 and Qt 6.

Bump minimum CMake version to 3.14 since that is the first version that
accepts Qt with major version 6 in AUTOMOC/AUTOUIC.

Task-number: QTCREATORBUG-24206
Change-Id: I2ff462e67f01d84939c02be579579f358bc0b20e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2020-06-18 14:23:06 +02:00
parent 569ad98852
commit c0bbbc2f70
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.14)
project(%{ProjectName} LANGUAGES CXX) project(%{ProjectName} LANGUAGES CXX)
@@ -12,7 +12,8 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@if %{HasTranslation} @if %{HasTranslation}
find_package(Qt5 COMPONENTS Core LinguistTools REQUIRED) find_package(QT NAMES Qt6 Qt5 COMPONENTS Core LinguistTools REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core LinguistTools REQUIRED)
set(TS_FILES %{TsFileName}) set(TS_FILES %{TsFileName})
@else @else
@@ -25,7 +26,7 @@ add_executable(%{ProjectName}
${TS_FILES} ${TS_FILES}
@endif @endif
) )
target_link_libraries(%{ProjectName} Qt5::Core) target_link_libraries(%{ProjectName} Qt${QT_VERSION_MAJOR}::Core)
@if %{HasTranslation} @if %{HasTranslation}
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})

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

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.14)
project(%{ProjectName} LANGUAGES CXX) project(%{ProjectName} LANGUAGES CXX)
@@ -13,11 +13,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
@if '%{QtModule}' != 'none' @if '%{QtModule}' != 'none'
@if %{HasTranslation} @if %{HasTranslation}
find_package(Qt5 COMPONENTS %{QtModuleUpperCase} LinguistTools REQUIRED) find_package(QT NAMES Qt6 Qt5 COMPONENTS %{QtModuleUpperCase} LinguistTools REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS %{QtModuleUpperCase} LinguistTools REQUIRED)
set(TS_FILES %{TsFileName}) set(TS_FILES %{TsFileName})
@else @else
find_package(Qt5 COMPONENTS %{QtModuleUpperCase} REQUIRED) find_package(QT NAMES Qt6 Qt5 COMPONENTS %{QtModuleUpperCase} REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS %{QtModuleUpperCase} REQUIRED)
@endif @endif
@endif @endif
@@ -36,7 +38,7 @@ add_library(%{ProjectName} %{JS: %{IsStatic} ? 'STATIC' : 'SHARED'}
) )
@if '%{QtModule}' != 'none' @if '%{QtModule}' != 'none'
target_link_libraries(%{ProjectName} PRIVATE Qt5::%{QtModuleUpperCase}) target_link_libraries(%{ProjectName} PRIVATE Qt${QT_VERSION_MAJOR}::%{QtModuleUpperCase})
@endif @endif
@if '%{IsShared}' @if '%{IsShared}'

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

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.14)
project(%{ProjectName} LANGUAGES CXX) project(%{ProjectName} LANGUAGES CXX)
@@ -25,11 +25,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
#endif() #endif()
@if %{HasTranslation} @if %{HasTranslation}
find_package(Qt5 COMPONENTS Core Quick LinguistTools REQUIRED) find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick LinguistTools REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick LinguistTools REQUIRED)
set(TS_FILES %{TsFileName}) set(TS_FILES %{TsFileName})
@else @else
find_package(Qt5 COMPONENTS Core Quick REQUIRED) find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick REQUIRED)
@endif @endif
if(ANDROID) if(ANDROID)
@@ -53,7 +55,7 @@ endif()
target_compile_definitions(%{ProjectName} target_compile_definitions(%{ProjectName}
PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>) PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
target_link_libraries(%{ProjectName} target_link_libraries(%{ProjectName}
PRIVATE Qt5::Core Qt5::Quick) PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick)
@if %{HasTranslation} @if %{HasTranslation}
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})

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

@@ -25,11 +25,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
#endif() #endif()
@if %{HasTranslation} @if %{HasTranslation}
find_package(Qt5 COMPONENTS Widgets LinguistTools REQUIRED) find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets LinguistTools REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets LinguistTools REQUIRED)
set(TS_FILES %{TsFileName}) set(TS_FILES %{TsFileName})
@else @else
find_package(Qt5 COMPONENTS Widgets REQUIRED) find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
@endif @endif
if(ANDROID) if(ANDROID)
@@ -58,7 +60,7 @@ else()
) )
endif() endif()
target_link_libraries(%{ProjectName} PRIVATE Qt5::Widgets) target_link_libraries(%{ProjectName} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
@if %{HasTranslation} @if %{HasTranslation}
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})