aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2019-08-16 13:36:22 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2019-08-19 11:35:20 +0000
commitc1454ed8d379b10869274f54e03be5b08ccc0edf (patch)
tree96a16a0035c435ea856d98027678a24dd85916a6
parent379c22bd555aa5236b0cae91d18523b2aca20342 (diff)
baremetal: Fix IAR assembler file tags
The IAR EW IDE provides the following file patterns [*.s*, *.msa, *.asm] for the assembler files. So, we will use same patterns too. But, instead of '*.s*' pattern we will use a set of the following patterns: '*.s' - for ARM and/or STM8 architectures. '*.s43' - for MSP430 architecture. '*.s51' - for 8051 architecture. '*.s90' - for AVR architecture. Change-Id: I5aad9ee7a81325e65be18d0ae0e0c1c9a9f6cf27 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--share/qbs/modules/cpp/iar.qbs9
1 files changed, 1 insertions, 8 deletions
diff --git a/share/qbs/modules/cpp/iar.qbs b/share/qbs/modules/cpp/iar.qbs
index 47cdff0ed..8140a8e73 100644
--- a/share/qbs/modules/cpp/iar.qbs
+++ b/share/qbs/modules/cpp/iar.qbs
@@ -116,14 +116,7 @@ CppModule {
}
FileTagger {
- condition: qbs.architecture === "arm" || qbs.architecture === "stm8";
- patterns: "*.s"
- fileTags: ["asm"]
- }
-
- FileTagger {
- condition: qbs.architecture === "mcs51";
- patterns: ["*.s51", "*.asm"]
+ patterns: ["*.s", "*.s43", "*.s51", "*.s90", "*.msa", "*.asm"]
fileTags: ["asm"]
}