diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-04 14:30:20 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-08 10:31:22 +0000 |
| commit | 6346ffeacaf57b7ecf1fac700490a0250a65e4ca (patch) | |
| tree | c63ed0eb2e3f46da4e9b931ab5a4316872fca851 /share/qbs/imports/qbs/Probes | |
| parent | b56a924c6b476f280583be9aa557510d1db34f23 (diff) | |
MSVC: Add support for the Visual Studio 2017 Build Tools
This entails:
- Auto-detection: The Build Tools no longer have an entry in the
registry; use the vswhere tool instead.
- Unset the VSINSTALLDIR environment variable before calling the
vcvarsall.bat script, as this variable can confuse the msbuild.bat sub-
script if it is set.
- Look for the base include directory two levels above the directory
under which cl.exe is located.
Change-Id: Id8f7976e5f41015e59850d3ed68fa81b6ce701a2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/Probes')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/MsvcProbe.qbs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/Probes/MsvcProbe.qbs b/share/qbs/imports/qbs/Probes/MsvcProbe.qbs index 700c579f5..2bbe57939 100644 --- a/share/qbs/imports/qbs/Probes/MsvcProbe.qbs +++ b/share/qbs/imports/qbs/Probes/MsvcProbe.qbs @@ -82,6 +82,8 @@ PathProbe { var inclPath = FileInfo.joinPaths(clParentDir, "INCLUDE"); if (!File.exists(inclPath)) inclPath = FileInfo.joinPaths(clParentDir, "..", "INCLUDE"); + if (!File.exists(inclPath)) + inclPath = FileInfo.joinPaths(clParentDir, "..", "..", "INCLUDE"); if (File.exists(inclPath)) includePaths = [inclPath]; |