diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-05-13 15:28:49 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-05-17 11:02:15 +0000 |
| commit | 2cb1a12be9221528196ec397babb7553f65de7bb (patch) | |
| tree | c138929f26993d25d198b8ccf683b64082fe7503 | |
| parent | cb78f8f90ab591966483cf47f82306dff99509a1 (diff) | |
Add missing _MSC_VER=XXXX define to compilerDefines
The _MSC_VER define must be passed to moc and friends.
Change-Id: I77d1a030e802a24b6980d67434e05ae0be96a20d
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | share/qbs/modules/cpp/msvc.js | 9 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js index c671f8abe..f862999a9 100644 --- a/share/qbs/modules/cpp/msvc.js +++ b/share/qbs/modules/cpp/msvc.js @@ -33,6 +33,15 @@ var FileInfo = loadExtension("qbs.FileInfo"); var ModUtils = loadExtension("qbs.ModUtils"); var WindowsUtils = loadExtension("qbs.WindowsUtils"); +function compilerVersionDefine(cpp) { + var result = '_MSC_VER=' + cpp.compilerVersionMajor; + var s = cpp.compilerVersionMinor.toString(); + while (s.length < 2) + s = '0' + s; + result += s; + return result; +} + function prepareCompiler(project, product, inputs, outputs, input, output) { var i; var optimization = ModUtils.moduleProperty(input, "optimization") diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index cce1a547b..93f76ab38 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -52,7 +52,7 @@ CppModule { flags.push("/FS"); return flags; } - compilerDefines: ['_WIN32'] + compilerDefines: ['_WIN32', MSVC.compilerVersionDefine(module)] warningLevel: "default" compilerName: "cl.exe" assemblerName: { |