summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-09-09 22:55:23 +0800
committerGitHub <[email protected]>2024-09-09 22:55:23 +0800
commit433db1562c297563806677f15e1d92c8acab81d1 (patch)
tree7b2c7e53103b058d83abc446d7539fb1b31c1706
parentd2f67fb9a524fb9d78a54a7998252ec72ebe4583 (diff)
parentb9a3bc5fd10ee412188c1b41629481847fa8210c (diff)
Merge pull request #5590 from Domain/patch-1
fix #5589
-rw-r--r--xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua9
-rw-r--r--xmake/plugins/project/vsxmake/getinfo.lua9
2 files changed, 6 insertions, 12 deletions
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
index caed16b2a..82d19818e 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
@@ -97,9 +97,6 @@ function _make_filter(filepath, target, vcxprojdir)
filter = path.normalize(path.directory(fileitem))
end
end
- if filter and filter == '.' then
- filter = nil
- end
goto found_filter
end
end
@@ -118,9 +115,9 @@ function _make_filter(filepath, target, vcxprojdir)
if filter then
filter = _strip_dotdirs(filter)
end
- if filter and filter == '.' then
- filter = nil
- end
+ end
+ if filter and filter == '.' then
+ filter = nil
end
return filter
end
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index 5d52733e5..2981024ea 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -353,9 +353,6 @@ function _make_filter(filepath, target, vcxprojdir)
filter = path.normalize(path.directory(fileitem))
end
end
- if filter and filter == '.' then
- filter = nil
- end
goto found_filter
end
end
@@ -374,9 +371,9 @@ function _make_filter(filepath, target, vcxprojdir)
if filter then
filter = _strip_dotdirs(filter)
end
- if filter and filter == '.' then
- filter = nil
- end
+ end
+ if filter and filter == '.' then
+ filter = nil
end
return filter
end