summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-05-07 23:37:45 +0800
committerruki <[email protected]>2022-05-07 23:37:45 +0800
commit48e5a65e288d71471daa2d4c54192899824a223b (patch)
treedc5c8e5c71dab52fa8758eb9acbdba6adb17d49d
parent9781f7bd7e55bea7a4641f991f8bed2d9233f6a6 (diff)
fix filegroup match
-rw-r--r--xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua4
-rw-r--r--xmake/plugins/project/vsxmake/getinfo.lua2
2 files changed, 3 insertions, 3 deletions
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
index b26bea68e..d418afb34 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
@@ -82,8 +82,8 @@ function _make_filter(filepath, target, vcxprojdir)
local files = extraconf.files or "**"
local mode = extraconf.mode
for _, filepattern in ipairs(files) do
- filepattern = path.pattern(path.translate(filepattern))
- if fileitem:match(filepattern) then
+ filepattern = path.pattern(path.absolute(path.join(rootdir, filepattern)))
+ if filepath:match(filepattern) then
if mode == "plain" then
filter = path.normalize(filegroup)
else
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index d07757d19..f855b3bee 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -360,7 +360,7 @@ function _make_filter(filepath, target, vcxprojdir)
local files = extraconf.files or "**"
local mode = extraconf.mode
for _, filepattern in ipairs(files) do
- filepattern = path.pattern(path.translate(filepattern))
+ filepattern = path.pattern(path.absolute(path.join(rootdir, filepattern)))
if fileitem:match(filepattern) then
if mode == "plain" then
filter = path.normalize(filegroup)