summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2016-09-01 10:05:55 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2016-09-02 15:06:11 +0000
commit7fb34481617cb1a283082cb12885dd3f625e77a2 (patch)
tree39b87c0c9316e13f87e2804446acf7be8a0380fe
parented9f8a0e9d2984b0b9d6aa31ab3a7209bae1708e (diff)
configure.pri: Determine MSVC compiler version
Run cl.exe /? and extract version from header line printed to standard error. Change-Id: Iecf18f1b0f94cc1d51add7021d80772784e0f953 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--configure.pri3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri
index 8c87aaed81..6a75398d35 100644
--- a/configure.pri
+++ b/configure.pri
@@ -281,8 +281,11 @@ defineTest(qtConfTest_checkCompiler) {
$${1}.compilerId = "icc"
$${1}.compilerVersion = $$replace(version, "icpc version ([0-9.]+).*", "\\1")
} else: msvc {
+ qtRunLoggedCommand("$$QMAKE_CXX /? 2>&1", version)|return(false)
+ version = "$$version"
$${1}.compilerDescription = "MSVC"
$${1}.compilerId = "cl"
+ $${1}.compilerVersion = $$replace(version, "^.*Compiler Version ([0-9.]+) for.*$", "\\1")
} else {
return(false)
}