Skip to content

Commit 2bf33a0

Browse files
committed
fix nuget links #6082
1 parent dd67d6e commit 2bf33a0

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

xmake/modules/package/manager/nuget/find_package.lua

+12-8
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,18 @@ function _find_package(name, result, opt)
8989

9090
-- get linkdirs and links
9191
if file:endswith(".lib") then
92-
local libfile = path.unix(path.join(libdir, libarch, toolset, libmode, runtime))
93-
if file:startswith(libfile .. "/") then
94-
result.links = result.links or {}
95-
result.linkdirs = result.linkdirs or {}
96-
result.libfiles = result.libfiles or {}
97-
table.insert(result.linkdirs, path.directory(filepath))
98-
table.insert(result.links, target.linkname(path.filename(filepath), {plat = plat}))
99-
table.insert(result.libfiles, filepath)
92+
local searchdirs = {}
93+
table.insert(searchdirs, path.unix(path.join(libdir, libarch, toolset, libmode, runtime)))
94+
table.insert(searchdirs, path.unix(path.join(libdir, libarch)))
95+
for _, searchdir in ipairs(searchdirs) do
96+
if file:startswith(searchdir .. "/") then
97+
result.links = result.links or {}
98+
result.linkdirs = result.linkdirs or {}
99+
result.libfiles = result.libfiles or {}
100+
table.insert(result.linkdirs, path.directory(filepath))
101+
table.insert(result.links, target.linkname(path.filename(filepath), {plat = plat}))
102+
table.insert(result.libfiles, filepath)
103+
end
100104
end
101105
end
102106
end

0 commit comments

Comments
 (0)