diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-01-16 13:33:42 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-01-16 13:59:04 +0000 |
| commit | 351fdb7789c4c9c3c798054c4f75eb3cd9ef9eed (patch) | |
| tree | 76f208a9a7893e9ae2e3cca680a63a6b9c0f9125 /share/qbs/imports/qbs/Probes/MsvcProbe.qbs | |
| parent | fbf8be669d944c74835e20e5e3cb43d067253a44 (diff) | |
Set cpp.compilerIncludePaths also for MSVC
This fixes the artifactScanning() autotest failure on Windows.
Change-Id: I37dd5b3f1f6f8f8899ef40cb9eef313f6c7b613e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/Probes/MsvcProbe.qbs')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/MsvcProbe.qbs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/Probes/MsvcProbe.qbs b/share/qbs/imports/qbs/Probes/MsvcProbe.qbs index 05a307439..d62a9e1ea 100644 --- a/share/qbs/imports/qbs/Probes/MsvcProbe.qbs +++ b/share/qbs/imports/qbs/Probes/MsvcProbe.qbs @@ -29,6 +29,8 @@ ****************************************************************************/ import qbs +import qbs.File +import qbs.FileInfo import qbs.ModUtils import qbs.Utilities @@ -42,6 +44,7 @@ PathProbe { property int versionMajor property int versionMinor property int versionPatch + property stringList includePaths property var buildEnv configure: { @@ -58,6 +61,12 @@ PathProbe { versionPatch = parseInt(ver.substr(4), 10); buildEnv = info.buildEnvironment; + var clParentDir = FileInfo.joinPaths(FileInfo.path(compilerFilePath), ".."); + var inclPath = FileInfo.joinPaths(clParentDir, "INCLUDE"); + if (!File.exists(inclPath)) + inclPath = FileInfo.joinPaths(clParentDir, "..", "INCLUDE"); + if (File.exists(inclPath)) + includePaths = [inclPath]; if (preferredArchitecture && Utilities.canonicalArchitecture(preferredArchitecture) !== Utilities.canonicalArchitecture(architecture)) { |