diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-04-20 22:25:49 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-04-23 13:11:38 +0000 |
| commit | 2f34e637828f7e519a25a498bd5aa4e8f955217d (patch) | |
| tree | 9040ced21c278ff551a4506c3c471398ecadd2f8 /src/lib/corelib/tools/msvcinfo.h | |
| parent | 9ab9f972fc2ee1642b73c8abb2aafe6a87e287df (diff) | |
| download | qbs-2f34e637828f7e519a25a498bd5aa4e8f955217d.tar.gz | |
msvc: Pass -vcvars_ver to vcvarsall.bat when detecting environment
This is required to properly support multiple MSVC toolchains (also now
supported).
Fixes: QBS-1498
Change-Id: I1274379496d47ebf7842eaed05f498b7af111b5b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/tools/msvcinfo.h')
| -rw-r--r-- | src/lib/corelib/tools/msvcinfo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/corelib/tools/msvcinfo.h b/src/lib/corelib/tools/msvcinfo.h index d081e5c15..efaf0b6c2 100644 --- a/src/lib/corelib/tools/msvcinfo.h +++ b/src/lib/corelib/tools/msvcinfo.h @@ -100,6 +100,7 @@ public: QBS_EXPORT void init(); QBS_EXPORT static QString architectureFromClPath(const QString &clPath); + QBS_EXPORT static QString vcVariablesVersionFromBinPath(const QString &binPath); QBS_EXPORT static QString canonicalArchitecture(const QString &arch); QBS_EXPORT static std::pair<QString, QString> getHostTargetArchPair(const QString &arch); QBS_EXPORT QString binPathForArchitecture(const QString &arch) const; |