diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-10-15 15:24:30 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-10-16 14:44:00 +0200 |
| commit | c200f8faeaa565286e2c3fe3775a6d9d25140792 (patch) | |
| tree | 95ab2a2b43e354229db35877b2b0757b67f664a0 /share | |
| parent | 416ce875b2949d6a7d13f956298fc44832ed8205 (diff) | |
| download | qbs-c200f8faeaa565286e2c3fe3775a6d9d25140792.tar.gz | |
create a profile per MSVC installation and per architecture
detect-toolchains will now create one profile per supported
architecture per found MSVC installation.
Task-number: QBS-404
Change-Id: I6ca569c312c31c39c49cfbfe5ffa638698fb90b2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/qbs/common.qbs | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index effe15a04..419a6f922 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -21,7 +21,7 @@ CppModule { property bool generateManifestFiles: true property path toolchainInstallPath property path windowsSDKPath - property string architecture: qbs.architecture || "x86" + architecture: qbs.architecture || "x86" // ### remove in 1.2 staticLibraryPrefix: "" dynamicLibraryPrefix: "" executablePrefix: "" diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs index 6b9a35f76..e866c02e4 100644 --- a/share/qbs/modules/qbs/common.qbs +++ b/share/qbs/modules/qbs/common.qbs @@ -39,8 +39,11 @@ Module { } validate: { - if (!architecture) // ### remove and replace with suggestion to re-run detect-toolchains, - return; // once QBS-404 is fixed + if (!architecture) { // ### don't warn but throw in 1.2 + print("WARNING: qbs.architecture is not set. " + + "You might want to re-run 'qbs detect-toolchains'."); + return; + } var architectureSynonyms = { "x86": ["i386", "i486", "i586", "i686", "ia32", "ia-32", "x86_32", "x86-32", "intel32"], |