aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/cpp/CppModule.qbs
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@theqtcompany.com>2015-10-28 18:57:11 -0700
committerJake Petroules <jake.petroules@theqtcompany.com>2015-10-31 03:23:28 +0000
commita36012d727bb0f755b349e64af481d315c06bd56 (patch)
treefe7ec3424323a4df08095da8c396c58717b51e7a /share/qbs/modules/cpp/CppModule.qbs
parente58833f87a83156b886ad435294bd3cbbc21f496 (diff)
Introduce new assembler-related properties.
This adds: - cpp.assemblerName - cpp.assemblerPath - cpp.assemblerFlags - cpp.platformAssemblerFlags Users can now, for example, use nasm instead of GNU as (default). Task-number: QBS-891 Change-Id: I8501abea494b327ac95f02f3cded263dbe72f12f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'share/qbs/modules/cpp/CppModule.qbs')
-rw-r--r--share/qbs/modules/cpp/CppModule.qbs9
1 files changed, 9 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index e671b1cae..3ee0cf088 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -135,6 +135,8 @@ Module {
property pathList frameworkPaths
property pathList systemFrameworkPaths
property pathList linkerScripts
+ property string assemblerName
+ property string assemblerPath: assemblerName
property string compilerName
property string compilerPath: compilerName
property var compilerPathByLanguage
@@ -158,6 +160,12 @@ Module {
property stringList rpaths
property bool useRPaths: true
+ property stringList assemblerFlags
+ PropertyOptions {
+ name: "assemblerFlags"
+ description: "additional flags for the assembler"
+ }
+
property stringList cppFlags
PropertyOptions {
name: "cppFlags"
@@ -248,6 +256,7 @@ Module {
// Platform properties. Those are intended to be set by the toolchain setup
// and are prepended to the corresponding user properties.
+ property stringList platformAssemblerFlags
property stringList platformCommonCompilerFlags
property stringList platformCFlags
property stringList platformCxxFlags