fix nuget links xmake-io#6082

A2va · Jan 16, 2025 · 2bf33a0 · 2bf33a0
1 parent dd67d6e
commit 2bf33a0
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/xmake/modules/package/manager/nuget/find_package.lua b/xmake/modules/package/manager/nuget/find_package.lua
@@ -89,14 +89,18 @@ function _find_package(name, result, opt)
 
             -- get linkdirs and links
             if file:endswith(".lib") then
-                local libfile = path.unix(path.join(libdir, libarch, toolset, libmode, runtime))
-                if file:startswith(libfile .. "/") then
-                    result.links = result.links or {}
-                    result.linkdirs = result.linkdirs or {}
-                    result.libfiles = result.libfiles or {}
-                    table.insert(result.linkdirs, path.directory(filepath))
-                    table.insert(result.links, target.linkname(path.filename(filepath), {plat = plat}))
-                    table.insert(result.libfiles, filepath)
+                local searchdirs = {}
+                table.insert(searchdirs, path.unix(path.join(libdir, libarch, toolset, libmode, runtime)))
+                table.insert(searchdirs, path.unix(path.join(libdir, libarch)))
+                for _, searchdir in ipairs(searchdirs) do
+                    if file:startswith(searchdir .. "/") then
+                        result.links = result.links or {}
+                        result.linkdirs = result.linkdirs or {}
+                        result.libfiles = result.libfiles or {}
+                        table.insert(result.linkdirs, path.directory(filepath))
+                        table.insert(result.links, target.linkname(path.filename(filepath), {plat = plat}))
+                        table.insert(result.libfiles, filepath)
+                    end
                 end
             end
         end