diff options
Diffstat (limited to 'share/qbs/modules/cpp/CppModule.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index 39077bec8..0a959ea8e 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -32,7 +32,7 @@ import qbs.ModUtils import qbs.Utilities import qbs.WindowsUtils - +import "cpp.js" as Cpp import "setuprunenv.js" as SetupRunEnv Module { @@ -190,6 +190,7 @@ Module { property string linkerMapSuffix: ".map" property string compilerListingSuffix: ".lst" property string assemblerListingSuffix: ".lst" + property string resourceSuffix: ".res" property bool createSymlinks: true property stringList dynamicLibraries // list of names, will be linked with -lname property stringList staticLibraries // list of static library files @@ -204,6 +205,18 @@ Module { property bool discardUnusedData property bool removeDuplicateLibraries: true + property string defineFlag + property string includeFlag + property string systemIncludeFlag + property string preincludeFlag + property string libraryDependencyFlag + property string libraryPathFlag + property string linkerScriptFlag + + property stringList knownArchitectures: [] + property var toolchainDetails + property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : "" + property string linkerMode: "automatic" PropertyOptions { name: "linkerMode" @@ -533,6 +546,13 @@ Module { return '"' + a + '"'; }).join(", ") + ". See https://docs.microsoft.com/en-us/windows/desktop/SysInfo/operating-system-version"); } + + if (knownArchitectures && knownArchitectures.length > 0) { + var isSupported = Cpp.supportsArchitecture(qbs.architecture, knownArchitectures); + if (!isSupported) { + throw ModUtils.ModuleError("Unsupported architecture: '" + qbs.architecture + "'"); + } + } } } |