aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/cpp/keil.qbs
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2021-05-04 16:49:38 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2021-05-06 10:18:11 +0000
commit8b4ea1276558e65109982339d3ae65a143e2360d (patch)
treece18aa59d60a34f01b990673a19f55c56b0eac82 /share/qbs/modules/cpp/keil.qbs
parent614e7381255bc48a494df45f09015c0ad9a7453f (diff)
Fix conditionally generation for some artifacts and tags
We need to generate a list of file tags and artifacts taking into account the dependent properties from the product. For example, we should only build tags for generating linker files if the generateLinkerMapFile property has been set. Change-Id: I286c566ffe119eebf24b60113dda65403f7af3dd Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules/cpp/keil.qbs')
-rw-r--r--share/qbs/modules/cpp/keil.qbs6
1 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/keil.qbs b/share/qbs/modules/cpp/keil.qbs
index ea99b589c..1d84f43d8 100644
--- a/share/qbs/modules/cpp/keil.qbs
+++ b/share/qbs/modules/cpp/keil.qbs
@@ -102,7 +102,7 @@ CppModule {
Rule {
id: assembler
inputs: ["asm"]
- outputFileTags: ["obj", "lst"]
+ outputFileTags: KEIL.compilerOutputTags(generateAssemblerListingFiles)
outputArtifacts: KEIL.compilerOutputArtifacts(input, false)
prepare: KEIL.prepareAssembler.apply(KEIL, arguments)
}
@@ -116,7 +116,7 @@ CppModule {
id: compiler
inputs: ["cpp", "c"]
auxiliaryInputs: ["hpp"]
- outputFileTags: ["obj", "lst"]
+ outputFileTags: KEIL.compilerOutputTags(generateCompilerListingFiles)
outputArtifacts: KEIL.compilerOutputArtifacts(input, true)
prepare: KEIL.prepareCompiler.apply(KEIL, arguments)
}
@@ -126,7 +126,7 @@ CppModule {
multiplex: true
inputs: ["obj", "linkerscript"]
inputsFromDependencies: ["staticlibrary"]
- outputFileTags: ["application", "mem_map"]
+ outputFileTags: KEIL.applicationLinkerOutputTags(generateLinkerMapFile)
outputArtifacts: KEIL.applicationLinkerOutputArtifacts(product)
prepare: KEIL.prepareLinker.apply(KEIL, arguments)
}