diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-15 17:02:30 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-21 12:07:57 +0200 |
commit | 38dff256974a893d34e8607b2954cad45fd55953 (patch) | |
tree | 5a7aede23c24a6534e11b6bf2e20b797e29780cb /src/app/qbs-setup-toolchains/msvcprobe.cpp | |
parent | 3957eac2205256ebe7784d2bc95fc4913c52801e (diff) |
Cpp module: Make the compiler version available as properties.
It is conceivable that rules might be interested in this information.
Change-Id: If1a93a226b48c8dfe807c6a3747eaf52580dc378
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/app/qbs-setup-toolchains/msvcprobe.cpp')
-rw-r--r-- | src/app/qbs-setup-toolchains/msvcprobe.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp index b4e07eb4d..8ea83acbb 100644 --- a/src/app/qbs-setup-toolchains/msvcprobe.cpp +++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp @@ -29,6 +29,7 @@ #include "msvcprobe.h" +#include "compilerversion.h" #include "msvcinfo.h" #include "probe.h" #include "vsenvironmentdetector.h" @@ -78,7 +79,10 @@ static void addMSVCPlatform(const MSVC &msvc, Settings *settings, QList<Profile> p.setValue(QLatin1String("cpp.platformCFlags"), flags); p.setValue(QLatin1String("cpp.platformCxxFlags"), flags); } - writeEnvironment(p, msvc.environments.value(architecture)); + const QProcessEnvironment compilerEnvironment = msvc.environments.value(architecture); + setCompilerVersion(installPath + QLatin1String("/cl.exe"), QStringList(QLatin1String("msvc")), + p, compilerEnvironment); + writeEnvironment(p, compilerEnvironment); profiles << p; } |