diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2019-02-01 16:20:49 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2019-02-04 13:13:06 +0000 |
| commit | 4c8f16a35945fc8dd539e76a554b7b48e99d983c (patch) | |
| tree | 3e95d1e9d105d8750f8e1e5649b9f31b12bb9a76 | |
| parent | 0675fc4d46001fb1c0936bd0354f20c9a3e66063 (diff) | |
Fix incorrect target dependency in Qt/MSBuild
Revised the dependency information of Qt/MSBuild targets. The previous
defnitions made Qt targets run ahead of required MSVC targets, which
caused build problems, e.g. ignoring project dependencies.
Task-number: QTVSADDINBUG-613
Change-Id: I75f8aa53f01845c70239e191d3a1afa429260617
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/qtmsbuild/qt_globals.targets | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qtmsbuild/qt_globals.targets b/src/qtmsbuild/qt_globals.targets index 972047a5..a2f112ae 100644 --- a/src/qtmsbuild/qt_globals.targets +++ b/src/qtmsbuild/qt_globals.targets @@ -41,7 +41,7 @@ // Build dependencies // --> <PropertyGroup> - <BuildDependsOn>Qt;$(BuildDependsOn)</BuildDependsOn> + <BuildDependsOn>QtVersion;$(BuildDependsOn);Qt</BuildDependsOn> <CleanDependsOn>$(CleanDependsOn);QtClean</CleanDependsOn> </PropertyGroup> @@ -76,7 +76,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// // Print debug message with Qt/MSBuild version // --> - <Target Name="QtVersion" BeforeTargets="$(BuildDependsOn);Build"> + <Target Name="QtVersion"> <Message Importance="High" Condition="'$(QtDebug)' == 'true'" Text="Qt/MSBuild v$(QtMsBuildVersion) ($(MSBuildThisFileDirectory))"/> </Target> @@ -201,8 +201,8 @@ // Run Qt tools and add dynamic C++ sources to build // --> <Target Name="QtWork" - DependsOnTargets="QtVersion;QtPrepare;$(QtBuildTargets);QtWorkPrepare" - AfterTargets="CustomBuild" + DependsOnTargets="QtVersion;QtPrepare;QtWorkPrepare" + AfterTargets="ResolveReferences;CustomBuild" BeforeTargets="BuildCompile"> <Message Importance="High" Condition="'$(QtDebug)' == 'true'" @@ -344,6 +344,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// // Root Qt target // --> - <Target Name="Qt" DependsOnTargets="CustomBuild;QtWork;BuildCompile"/> + <Target Name="Qt" DependsOnTargets="QtWork"/> </Project> |