diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2020-12-16 20:12:22 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2020-12-18 14:16:24 +0000 |
| commit | 74b8c8a779e8c2cc0d609e4f30c9cc4470c318bf (patch) | |
| tree | 7f43018c527fb01c5d790afccf769486720f4deb /src/qtmsbuild/repc/qtrepc.targets | |
| parent | 77bf21b143bfe283b1c86afc263176cc5a337058 (diff) | |
Remove dependency of _SelectedFiles targetv2.7.0
The VC target _SelectedFiles is no longer a dependency of Qt tools'
targets. The required information is already given by the
$(SelectedFiles) property, so there is no need to invoke the target.
Also, in the latest version of VS 2019 (16.8), this dependency was
causing the incremental build to fail, as well as generating other
intermittent build errors.
Task-number: QTVSADDINBUG-841
Change-Id: Iceb3a3db65315a8c8c4721597338b710b74a8fdf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/qtmsbuild/repc/qtrepc.targets')
| -rw-r--r-- | src/qtmsbuild/repc/qtrepc.targets | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/qtmsbuild/repc/qtrepc.targets b/src/qtmsbuild/repc/qtrepc.targets index 0d93654a..6342cbd8 100644 --- a/src/qtmsbuild/repc/qtrepc.targets +++ b/src/qtmsbuild/repc/qtrepc.targets @@ -84,8 +84,11 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// // Prepare to process sources // --> - <Target Name="QtRepcPrepare" DependsOnTargets="_SelectedFiles" + <Target Name="QtRepcPrepare" Inputs="%(QtRepc.Identity)" Outputs="@(QtRepc->'####### Don't skip this target #######')"> + <ItemGroup> + <selected_files Include="$(SelectedFiles)"/> + </ItemGroup> <Message Importance="High" Condition="'$(QtDebug)' == 'true'" Text="## QtRepcPrepare @(QtRepc)"/> @@ -102,7 +105,7 @@ </ItemGroup> <PropertyGroup> - <selected_files>[@(SelectedFiles->'%(Identity)','][')]</selected_files> + <selected_files>[@(selected_files->'%(Identity)','][')]</selected_files> <file>[@(QtRepc->'%(Identity)')]</file> <output_file>@(QtRepc->'%(OutputFile)')</output_file> <is_selected Condition="$(selected_files.Contains('$(file)'))">true</is_selected> @@ -115,7 +118,7 @@ Condition="'$(SelectedFiles)' != '' AND '$(is_selected)' == 'true'" /> <!--// If a source was manually selected to build, remove all other sources --> - <ItemGroup Condition="'@(SelectedFiles)' != ''"> + <ItemGroup Condition="'@(selected_files)' != ''"> <QtRepc Remove="@(QtRepc)" Condition="'$(SelectedFiles)' != '' AND '$(is_selected)' != 'true'" /> </ItemGroup> @@ -369,6 +372,7 @@ <ItemGroup> <LocalOptions Remove="@(LocalOptions)"/> <options Remove="@(options)"/> + <selected_files Remove="@(selected_files)"/> </ItemGroup> </Target> |