aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Costa <miguel.costa@qt.io>2019-01-23 15:39:18 +0100
committerMiguel Costa <miguel.costa@qt.io>2019-01-24 14:14:12 +0000
commit10961ecb86d7688f3eb7fb782f7d38affef2aa09 (patch)
tree7a5120ab8c4d7a5caba9c301e68b5fd552ce7093
parenta35b4e3b75483161a995a9a24c9e28fa7f28383e (diff)
Fix incorrect dependency to C++ compiler targets
Set the Qt/MSBuild targets to depend on the BuildCompile target. Previously, a dependency existed with the ClCompile target. However, this was incorrect, as this target does not include all requirements for a successful C++ build (e.g. the MakeDirsForCl target is not run, meaning that output directories will not be created). Task-number: QTVSADDINBUG-609 Change-Id: If79a748d878d72c796c7f00608d06d9f6cca1ec0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r--src/qtmsbuild/qt_globals.targets4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtmsbuild/qt_globals.targets b/src/qtmsbuild/qt_globals.targets
index e732437d..e9eaf5ca 100644
--- a/src/qtmsbuild/qt_globals.targets
+++ b/src/qtmsbuild/qt_globals.targets
@@ -203,7 +203,7 @@
<Target Name="QtWork"
DependsOnTargets="QtVersion;QtPrepare;$(QtBuildTargets);QtWorkPrepare"
AfterTargets="CustomBuild"
- BeforeTargets="ClCompile">
+ BeforeTargets="BuildCompile">
<Message Importance="High" Condition="'$(QtDebug)' == 'true'"
Text="## Qt Build $(QtBuildTargets.Replace(';',' ').Trim())" />
@@ -344,6 +344,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////
// Root Qt target
// -->
- <Target Name="Qt" DependsOnTargets="CustomBuild;QtWork;ClCompile"/>
+ <Target Name="Qt" DependsOnTargets="CustomBuild;QtWork;BuildCompile"/>
</Project>