From b23d066f9da50b3f453d9534e3fa1ae51e84e36f Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Tue, 1 Nov 2022 07:43:03 +0100 Subject: [PATCH] McuSupport: Remove ASM_MASM from CMake project languages This was never required and was added to the list by accident. Task-number: UL-5875 Change-Id: I7957d49e9c87da91a81a363185f11e8331c650c3 Reviewed-by: Daniele Bortolotti Reviewed-by: Reviewed-by: Eike Ziller --- .../studio_templates/projects/application-mcu/CMakeLists.txt | 2 +- src/plugins/mcusupport/wizards/application/CMakeLists.txt | 2 +- src/plugins/mcusupport/wizards/qmlproject/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt index fa5be381289..b979c45227b 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.15) -project(%{ProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM) +project(%{ProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM) if (NOT TARGET Qul::Core) find_package(Qul) diff --git a/src/plugins/mcusupport/wizards/application/CMakeLists.txt b/src/plugins/mcusupport/wizards/application/CMakeLists.txt index c260ae1f104..1677e912926 100644 --- a/src/plugins/mcusupport/wizards/application/CMakeLists.txt +++ b/src/plugins/mcusupport/wizards/application/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.15) -project(%{CorrectedProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM) +project(%{CorrectedProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM) find_package(Qul) diff --git a/src/plugins/mcusupport/wizards/qmlproject/CMakeLists.txt b/src/plugins/mcusupport/wizards/qmlproject/CMakeLists.txt index 532918eb0f2..5374e7d2fe1 100644 --- a/src/plugins/mcusupport/wizards/qmlproject/CMakeLists.txt +++ b/src/plugins/mcusupport/wizards/qmlproject/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.15) -project(%{CorrectedProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM) +project(%{CorrectedProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM) find_package(Qul)