From d8ccadb3c40487f493a5d34ca78bd81d06a6a98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20=C5=9Aliwa?= Date: Fri, 3 Dec 2021 16:14:29 +0100 Subject: [PATCH] mcusupport: ASM_MASM language added to project in CMakeLists template After modification of how fontcompiler is linking font binaries into executale CMake project needs to have Microsoft Assembler language option added (ASM_MASM). Fixes: UL-5059 Change-Id: I593ca6230e8fbaf70a4061a12b6606843ab9bd46 Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/wizards/application/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/mcusupport/wizards/application/CMakeLists.txt b/src/plugins/mcusupport/wizards/application/CMakeLists.txt index 71c4e023432..74c1c8357ba 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(%{ProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM) +project(%{ProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM) find_package(Qul)