diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2018-09-10 12:54:22 +0200 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2018-09-10 12:04:08 +0000 |
| commit | e9c8e46ef1c5eac53512004bf51b67cb90f3c079 (patch) | |
| tree | 1ce62ee2d3b9d36b8bca695379e944902bf827a1 | |
| parent | f53b2a173340b8559716e34fc866f1496987908d (diff) | |
Use full path of dependencies when writing tracker log file
Recording file access log entries into the tracker files (*.tlog) now
uses the full path of additional dependency files. Previously, these
dependencies where added to the log with a path relative to the project,
which meant that the VS file tracker was unable to find them and would
not propertly manage incremental build, i.e. if a Qt item add any
additional dependencies, then the build would never be considered
up-to-date, and MSBuild would always be invoked, even if no changes were
made to any of the project files.
Change-Id: I614d9cb33e2e017f9e0efde760d7ed5ad672848d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/qtmsbuild/qt.targets | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qtmsbuild/qt.targets b/src/qtmsbuild/qt.targets index 9eda9a18..fa2ce0a7 100644 --- a/src/qtmsbuild/qt.targets +++ b/src/qtmsbuild/qt.targets @@ -52,7 +52,7 @@ Name="QtMocWriteTlogs" Condition="'@(QtMoc)' != '' and '@(SelectedFiles)' == ''"> <ItemGroup> - <QtMocReadTlog Include="^%(QtMoc.FullPath);%(QtMoc.AdditionalDependencies)" + <QtMocReadTlog Include="^%(QtMoc.FullPath);$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '%(QtMoc.AdditionalDependencies)'))" Condition="'%(QtMoc.ExcludedFromBuild)' != 'true' and '%(QtMoc.OutputFile)' != ''"/> <QtMocWriteTlog Include="^%(QtMoc.FullPath);$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '%(QtMoc.OutputFile)'))" Condition="'%(QtMoc.ExcludedFromBuild)' != 'true' and '%(QtMoc.OutputFile)' != ''"/> @@ -235,7 +235,7 @@ Name="QtRccWriteTlogs" Condition="'@(QtRcc)' != '' and '@(SelectedFiles)' == ''"> <ItemGroup> - <QtRccReadTlog Include="^%(QtRcc.FullPath);%(QtRcc.AdditionalDependencies)" + <QtRccReadTlog Include="^%(QtRcc.FullPath);$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '%(QtRcc.AdditionalDependencies)'))" Condition="'%(QtRcc.ExcludedFromBuild)' != 'true' and '%(QtRcc.OutputFile)' != ''"/> <QtRccWriteTlog Include="^%(QtRcc.FullPath);$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '%(QtRcc.OutputFile)'))" Condition="'%(QtRcc.ExcludedFromBuild)' != 'true' and '%(QtRcc.OutputFile)' != ''"/> @@ -411,7 +411,7 @@ Name="QtUicWriteTlogs" Condition="'@(QtUic)' != '' and '@(SelectedFiles)' == ''"> <ItemGroup> - <QtUicReadTlog Include="^%(QtUic.FullPath);%(QtUic.AdditionalDependencies)" + <QtUicReadTlog Include="^%(QtUic.FullPath);$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '%(QtUic.AdditionalDependencies)'))" Condition="'%(QtUic.ExcludedFromBuild)' != 'true' and '%(QtUic.OutputFile)' != ''"/> <QtUicWriteTlog Include="^%(QtUic.FullPath);$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '%(QtUic.OutputFile)'))" Condition="'%(QtUic.ExcludedFromBuild)' != 'true' and '%(QtUic.OutputFile)' != ''"/> |