diff options
author | Miguel Costa <miguel.costa@qt.io> | 2020-07-24 12:06:51 +0200 |
---|---|---|
committer | Miguel Costa <miguel.costa@qt.io> | 2020-07-24 13:31:51 +0000 |
commit | 8b1ca8c4a50bb4cab92c6f4f7d232a3d02247b7f (patch) | |
tree | 5d0bec08001a4a1dfc302f8c7bbfe836961f3b5c /src | |
parent | 834d9838c1c2eb3a2a494be77c0f55b3495e2836 (diff) |
Remove WSL path fixup
The MSBuild VC Linux targets for WSL assumes that paths are rooted in
the /mnt directory. This leads to errors when using host-based absolute
paths in build properties. However, fixing these on the Qt/MSBuild
targets is not the correct approach; paths should be assumed to be
correct as provided. The user should be advised to workaroung the issue
of "/mnt" prefixing by MSBuild, e.g. by creating symlinks in /mnt to
other root directories, as required.
Change-Id: I31f2ba604d0ca3e228b3b6e2e901cce06d42afba
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/qtmsbuild/qt_globals.targets | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/qtmsbuild/qt_globals.targets b/src/qtmsbuild/qt_globals.targets index 54815a97..8b6eb23d 100644 --- a/src/qtmsbuild/qt_globals.targets +++ b/src/qtmsbuild/qt_globals.targets @@ -502,36 +502,6 @@ <!-- /////////////////////////////////////////////////////////////////////////////////////////////// - // Fixup WSL include paths - // --> - <Flatten - Condition="'$(ApplicationType)' == 'Linux' AND '$(PlatformToolset)' == 'WSL_1_0'" - Items="@(ClCompile)" Metadata="AdditionalIncludeDirectories"> - <Output - TaskParameter="Result" ItemName="IncludePath" /> - </Flatten> - <ItemGroup - Condition="'$(ApplicationType)' == 'Linux' AND '$(PlatformToolset)' == 'WSL_1_0'"> - <IncludePath> - <Value Condition="$([System.String]::Copy('%(Value)').StartsWith('/'))">..%(Value)</Value> - </IncludePath> - </ItemGroup> - <ItemGroup - Condition="'$(ApplicationType)' == 'Linux' AND '$(PlatformToolset)' == 'WSL_1_0'"> - <ClCompile> - <Item>%(Identity)</Item> - </ClCompile> - </ItemGroup> - <ItemGroup - Condition="'$(ApplicationType)' == 'Linux' AND '$(PlatformToolset)' == 'WSL_1_0'"> - <ClCompile Condition="'%(Item)' != ''"> - <AdditionalIncludeDirectories>@(IncludePath->'%(Value)')</AdditionalIncludeDirectories> - <Item/> - </ClCompile> - </ItemGroup> - - <!-- - /////////////////////////////////////////////////////////////////////////////////////////////// // Clean-up // --> <ItemGroup> |