summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-12-27 23:38:30 +0800
committerruki <[email protected]>2020-12-27 23:38:30 +0800
commitea8e483128160d943685f0487fb82d586356ddb3 (patch)
tree91dda64664210a552212563aceb509689a7871d3
parent35c8f4c1b6d07b7a6b89db6184c17a34b1217762 (diff)
fix pcheader conflict for vs project
-rw-r--r--xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua8
1 files changed, 6 insertions, 2 deletions
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
index 04a53b052..9f9afc1fd 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
@@ -735,10 +735,14 @@ function _make_source_files(vcxprojfile, vsinfo, target, vcxprojdir)
vcxprojfile:leave("</ItemGroup>")
- -- add headers
+ -- add header files
+ local pcheader = target.pcxxheader or target.pcheader
vcxprojfile:enter("<ItemGroup>")
for _, includefile in ipairs(target.headerfiles) do
- _make_header_file(vcxprojfile, includefile, vcxprojdir)
+ -- we need ignore pcheader file to fix https://github.com/xmake-io/xmake/issues/1171
+ if not pcheader or includefile ~= pcheader then
+ _make_header_file(vcxprojfile, includefile, vcxprojdir)
+ end
end
vcxprojfile:leave("</ItemGroup>")
end