diff options
author | Miguel Costa <miguel.costa@qt.io> | 2019-02-05 16:36:31 +0100 |
---|---|---|
committer | Miguel Costa <miguel.costa@qt.io> | 2019-02-08 13:12:28 +0000 |
commit | bf49de59fe95c0772943d37561e7da9f34c8e00c (patch) | |
tree | d31503e517be133de78faa9980e828151dabdd48 /src/qtmsbuild/qt_globals.targets | |
parent | 4c8f16a35945fc8dd539e76a554b7b48e99d983c (diff) |
Use correct MSVC target dependencies
This patch corrects/supplements these previous patches:
Fix incorrect dependency to C++ compiler targets
10961ecb86d7688f3eb7fb782f7d38affef2aa09
Fix incorrect target dependency in Qt/MSBuild
4c8f16a35945fc8dd539e76a554b7b48e99d983c
The cumulative application of the three patches correctly sets up the
following rules of dependency between the Qt/MSBuild targets and the
MSVC targets:
* "Build" depends on "Qt", which depends on "QtWork"
* "QtWork" must run after "CustomBuild"
* "QtWork" must run before "ClCompile"
Links to the "ResolveReferences" and "BuildCompile" MSVC targets,
were introduced to address, resp., the problem of ignoring project
dependencies (QTVSADDINBUG-613) and the problem of missing output
directories (QTVSADDINBUG-609). These links have now been removed,
as they were causing some Qt targets to be called outside the scope
of the build process (e.g. when opening a project in Visual Studio).
Task-number: QTVSADDINBUG-609
Task-number: QTVSADDINBUG-611
Task-number: QTVSADDINBUG-613
Change-Id: I2eec407f4c4157813c6361845b0d67873611738f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/qtmsbuild/qt_globals.targets')
-rw-r--r-- | src/qtmsbuild/qt_globals.targets | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtmsbuild/qt_globals.targets b/src/qtmsbuild/qt_globals.targets index a2f112ae..baa48f65 100644 --- a/src/qtmsbuild/qt_globals.targets +++ b/src/qtmsbuild/qt_globals.targets @@ -202,8 +202,8 @@ // --> <Target Name="QtWork" DependsOnTargets="QtVersion;QtPrepare;QtWorkPrepare" - AfterTargets="ResolveReferences;CustomBuild" - BeforeTargets="BuildCompile"> + AfterTargets="CustomBuild" + BeforeTargets="ClCompile"> <Message Importance="High" Condition="'$(QtDebug)' == 'true'" Text="## Qt Build $(QtBuildTargets.Replace(';',' ').Trim())" /> |