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/vsenvironmentdetector.cpp | |
| parent | 9ab9f972fc2ee1642b73c8abb2aafe6a87e287df (diff) | |
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/vsenvironmentdetector.cpp')
| -rw-r--r-- | src/lib/corelib/tools/vsenvironmentdetector.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/corelib/tools/vsenvironmentdetector.cpp b/src/lib/corelib/tools/vsenvironmentdetector.cpp index a11934d52..82dff578f 100644 --- a/src/lib/corelib/tools/vsenvironmentdetector.cpp +++ b/src/lib/corelib/tools/vsenvironmentdetector.cpp @@ -244,6 +244,9 @@ void VsEnvironmentDetector::writeBatchFile(QIODevice *device, const QString &vcv s << "call \"" << vcvarsallbat << "\" " << vcArchitecture(msvc); if (!msvc->sdkVersion.isEmpty()) s << " " << msvc->sdkVersion; + const auto vcVarsVer = MSVC::vcVariablesVersionFromBinPath(msvc->binPath); + if (!vcVarsVer.isEmpty()) + s << " -vcvars_ver=" << vcVarsVer; s << " || exit /b 1" << endl; batPrintVars(s, varnames); s << "endlocal" << endl; |