diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2018-04-09 16:20:26 +0200 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2018-04-12 07:53:19 +0000 |
| commit | e4f6de392fd7f204ea5645a5f09092dc2e12b37a (patch) | |
| tree | 32229d2b6440d6de30b84c254ecb65d856b20bad | |
| parent | 5be07d0ccd48640234c42a35230f27c818f61501 (diff) | |
Move global properties outside of target QtPrepare
Global properties used by several Qt/MSBuild targets are now defined
outside the scope of a particular target. Previously, these properties
were defined inside the QtPrepare target, which made them dependent on
its execution. A subsequent patch will require that global properties
do not depend on the execution of this target.
Change-Id: Ib184d3fe589246506e43514dbb53d3f832750c83
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/qtmsbuild/qt.targets | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/qtmsbuild/qt.targets b/src/qtmsbuild/qt.targets index 5b4d13ae..4cd04c25 100644 --- a/src/qtmsbuild/qt.targets +++ b/src/qtmsbuild/qt.targets @@ -1,15 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <QtWorkFilePath Condition="'$(QtWorkFilePath)' == ''">$([System.IO.Path]::Combine($(ProjectDir),$(IntDir)qt.txt))</QtWorkFilePath> + <QtMaxProcs Condition="'$(QtMaxProcs)' == ''">$([System.Environment]::ProcessorCount)</QtMaxProcs> + <QtDebug Condition="'$(QtDebug)' == ''">false</QtDebug> + </PropertyGroup> <Target Name="QtPrepare" AfterTargets="CustomBuild" BeforeTargets="ClCompile"> - <PropertyGroup Condition="'$(QtDebug)' == ''"> - <QtDebug>false</QtDebug> - </PropertyGroup> - <PropertyGroup Condition="'$(QtWorkFilePath)' == ''"> - <QtWorkFilePath>$([System.IO.Path]::Combine($(ProjectDir),$(IntDir)qt.txt))</QtWorkFilePath> - </PropertyGroup> - <PropertyGroup Condition="'$(QtMaxProcs)' == ''"> - <QtMaxProcs>$([System.Environment]::ProcessorCount)</QtMaxProcs> - </PropertyGroup> <Message Importance="High" Condition="'$(QtDebug)' == 'true'" Text="# BEGIN Qt" /> <Message Importance="High" Condition="'$(QtDebug)' == 'true'" Text="## QtPrepare" /> <Delete Files="$(QtWorkFilePath)"/> |