summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2026-02-09 22:42:33 +0800
committerGitHub <[email protected]>2026-02-09 22:42:33 +0800
commitffca998d007a44b3f14ab5548e336a9d16eb9b75 (patch)
tree370dbacc71cf439782b1e5f283b6345218a00568
parent03935603aa49bc5c0dc7fd6777bd89ac05a37c91 (diff)
Update find_package.lua
-rw-r--r--xmake/modules/package/manager/vcpkg/find_package.lua16
1 files changed, 7 insertions, 9 deletions
diff --git a/xmake/modules/package/manager/vcpkg/find_package.lua b/xmake/modules/package/manager/vcpkg/find_package.lua
index fce1150a4..3e2a3b828 100644
--- a/xmake/modules/package/manager/vcpkg/find_package.lua
+++ b/xmake/modules/package/manager/vcpkg/find_package.lua
@@ -174,9 +174,7 @@ function _find_package(vcpkg, vcpkgdir, name, opt)
result = result or {}
for key, dependencylist in pairs(dependencyresult) do
result[key] = result[key] or {}
- for _, value in ipairs(dependencylist) do
- table.insert(result[key], value)
- end
+ table.join2(result[key], dependencylist)
end
end
end
@@ -198,14 +196,14 @@ function _find_package(vcpkg, vcpkgdir, name, opt)
-- remove repeat
if result then
- if result.linkdirs then
- result.linkdirs = table.unique(result.linkdirs)
- end
- if result.includedirs then
- result.includedirs = table.unique(result.includedirs)
+ for k, v in pairs(result) do
+ if k == "links" or k == "syslinks" or k == "frameworks" then
+ result[k] = table.unwrap(table.reverse_unique(v))
+ else
+ result[k] = table.unwrap(table.unique(v))
+ end
end
end
-
return result
end