From 0ef6c184c12254cee3f79df85e0f31e46f6d11a8 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 19 Sep 2023 11:02:50 +0200 Subject: [PATCH] QmlProject: Add new options to cmakefiles.txt template If the template was regernated (which is not the default), it was missing features. Change-Id: I446dd454127795e0e7edcb6669dc7025ce37be01 Reviewed-by: Reviewed-by: Tim Jenssen Reviewed-by: Qt CI Patch Build Bot --- .../cmakegen/qmlprojectmaincmakelists.tpl | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincmakelists.tpl b/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincmakelists.tpl index 423ed1a921a..4cd900a31ff 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincmakelists.tpl +++ b/src/plugins/qmlprojectmanager/cmakegen/qmlprojectmaincmakelists.tpl @@ -1,11 +1,19 @@ -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.21.1) + +option(LINK_INSIGHT "Link Qt Insight Tracker library" ON) +option(BUILD_QDS_COMPONENTS "Build design studio components" ON) project(%1 LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -find_package(Qt6 COMPONENTS Gui Qml Quick) +find_package(Qt6 6.2 REQUIRED COMPONENTS Core Gui Qml Quick) + +if (Qt6_VERSION VERSION_GREATER_EQUAL 6.3) + qt_standard_project_setup() +endif() + qt_add_executable(%1 src/main.cpp) qt_add_resources(%1 "configuration" @@ -20,5 +28,20 @@ target_link_libraries(%1 PRIVATE Qt${QT_VERSION_MAJOR}::Qml ) +if (BUILD_QDS_COMPONENTS) + include(${CMAKE_CURRENT_SOURCE_DIR}/qmlcomponents) +endif() + include(${CMAKE_CURRENT_SOURCE_DIR}/qmlmodules) +if (LINK_INSIGHT) + include(${CMAKE_CURRENT_SOURCE_DIR}/insight) +endif () + +include(GNUInstallDirs) +install(TARGETS CppExampleApp + BUNDLE DESTINATION . + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) +