From 064df19bd3d007297a3763b2ed4611939925d7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20=C5=9Aliwa?= Date: Thu, 11 Feb 2021 10:18:38 +0100 Subject: [PATCH] Update of Qt for MCU project template - Updating project template to match new CMake API of Qt for MCU v1.7 - Preserving backward compatibility with previous versions Task-number: QTCREATORBUG-25307 Change-Id: I8e45b69f440c7b7b63d3803c315658c6ef618952 Reviewed-by: Reviewed-by: Alessandro Portale Reviewed-by: Erik Verbruggen --- .../mcusupport/wizards/application/CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/plugins/mcusupport/wizards/application/CMakeLists.txt b/src/plugins/mcusupport/wizards/application/CMakeLists.txt index ea34696b240..e86a8fb6ac9 100644 --- a/src/plugins/mcusupport/wizards/application/CMakeLists.txt +++ b/src/plugins/mcusupport/wizards/application/CMakeLists.txt @@ -1,13 +1,19 @@ -cmake_minimum_required (VERSION 3.13) +cmake_minimum_required (VERSION 3.15) project(%{ProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM) find_package(Qul) -add_executable(%{ProjectName}) -qul_target_qml_sources(%{ProjectName} %{MainQmlFile}) +if(Qul_VERSION VERSION_GREATER_EQUAL "1.7") + qul_add_target(%{ProjectName}) +else() + add_executable(%{ProjectName}) + target_link_libraries(%{ProjectName} + Qul::QuickUltralite + Qul::QuickUltralitePlatform) +endif() -target_link_libraries(%{ProjectName} Qul::QuickUltralite) +qul_target_qml_sources(%{ProjectName} %{MainQmlFile}) app_target_setup_os(%{ProjectName}) app_target_default_main(%{ProjectName} %{RootItemName})