diff options
| author | ruki <[email protected]> | 2024-07-25 12:00:26 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-25 12:00:26 +0800 |
| commit | 4d53a1fbe312d896756bf86b35fa45d9e6fe90e2 (patch) | |
| tree | 7a6186ae34a3e574420f70126891795d851e9d88 /xmake/modules | |
| parent | 001cb3aff6bf009b942c2fd882f2b06012b7b6a5 (diff) | |
| parent | 7ad05dc941aa400582ad2357217ab976fd55b576 (diff) | |
Merge pull request #5392 from xmake-io/bindirs
add bindirs for pacakge
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/package/manager/xmake/find_package.lua | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xmake/modules/package/manager/xmake/find_package.lua b/xmake/modules/package/manager/xmake/find_package.lua index e3aed1294..18f6908ee 100644 --- a/xmake/modules/package/manager/xmake/find_package.lua +++ b/xmake/modules/package/manager/xmake/find_package.lua @@ -163,9 +163,12 @@ function _find_package_from_repo(name, opt) end end if opt.plat == "windows" or opt.plat == "mingw" then - for _, file in ipairs(os.files(path.join(installdir, "bin", "*.dll"))) do - result.shared = true - table.insert(libfiles, file) + local bindirs = opt.bindirs or "bin" + for _, bindir in ipairs(bindirs) do + for _, file in ipairs(os.files(path.join(installdir, bindir, "*.dll"))) do + result.shared = true + table.insert(libfiles, file) + end end -- @see https://github.com/xmake-io/xmake/issues/5325#issuecomment-2242513463 if not result.shared then |
