diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-06-14 10:22:36 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-06-14 11:02:40 +0000 |
| commit | 636b1d1239a9e66016255997f438a16e89b9e705 (patch) | |
| tree | 6b9d134960036b3496746865aaf92bc6fb6cb29e | |
| parent | aa859910f956161e1a4bc8b9b5012c2335bf5eca (diff) | |
Make property cpp.compilerExtension as shared
It makes sense to share the cpp.compilerExtension property,
because this property is used in almost all CPP modules.
Change-Id: I0bf44a83c722772b93d7f2febbef7b4e38d11103
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 1 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 1 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/cosmic.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/iar.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/keil.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/sdcc.qbs | 2 |
6 files changed, 1 insertions, 9 deletions
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index c47dab129..17c8c6bfc 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -214,6 +214,7 @@ Module { property stringList knownArchitectures: [] property var toolchainDetails + property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : "" property string linkerMode: "automatic" PropertyOptions { diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index a84716019..6f22ef3e2 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -178,7 +178,6 @@ CppModule { property string toolchainPathPrefix: Gcc.pathPrefix(toolchainInstallPath, toolchainPrefix) property string binutilsPathPrefix: Gcc.pathPrefix(binutilsPath, toolchainPrefix) - property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : "" property string cCompilerName: (qbs.toolchain.contains("clang") ? "clang" : "gcc") + compilerExtension property string cxxCompilerName: (qbs.toolchain.contains("clang") ? "clang++" : "g++") diff --git a/share/qbs/modules/cpp/cosmic.qbs b/share/qbs/modules/cpp/cosmic.qbs index 16872cd38..6df74d0e3 100644 --- a/share/qbs/modules/cpp/cosmic.qbs +++ b/share/qbs/modules/cpp/cosmic.qbs @@ -66,8 +66,6 @@ CppModule { toolchainInstallPath: compilerPathProbe.found ? compilerPathProbe.path : undefined - property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : "" - /* Work-around for QtCreator which expects these properties to exist. */ property string cCompilerName: compilerName property string cxxCompilerName: compilerName diff --git a/share/qbs/modules/cpp/iar.qbs b/share/qbs/modules/cpp/iar.qbs index ed63bd13c..e782e3ee1 100644 --- a/share/qbs/modules/cpp/iar.qbs +++ b/share/qbs/modules/cpp/iar.qbs @@ -66,8 +66,6 @@ CppModule { toolchainInstallPath: compilerPathProbe.found ? compilerPathProbe.path : undefined - property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : "" - /* Work-around for QtCreator which expects these properties to exist. */ property string cCompilerName: compilerName property string cxxCompilerName: compilerName diff --git a/share/qbs/modules/cpp/keil.qbs b/share/qbs/modules/cpp/keil.qbs index b9d3f8264..6dad0f0e6 100644 --- a/share/qbs/modules/cpp/keil.qbs +++ b/share/qbs/modules/cpp/keil.qbs @@ -64,8 +64,6 @@ CppModule { toolchainInstallPath: compilerPathProbe.found ? compilerPathProbe.path : undefined - property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : "" - /* Work-around for QtCreator which expects these properties to exist. */ property string cCompilerName: compilerName property string cxxCompilerName: compilerName diff --git a/share/qbs/modules/cpp/sdcc.qbs b/share/qbs/modules/cpp/sdcc.qbs index 3f7691769..f35e845fd 100644 --- a/share/qbs/modules/cpp/sdcc.qbs +++ b/share/qbs/modules/cpp/sdcc.qbs @@ -65,8 +65,6 @@ CppModule { toolchainInstallPath: compilerPathProbe.found ? compilerPathProbe.path : undefined - property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : "" - /* Work-around for QtCreator which expects these properties to exist. */ property string cCompilerName: compilerName property string cxxCompilerName: compilerName |