diff options
| author | ruki <[email protected]> | 2022-04-22 00:30:15 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-04-22 00:30:15 +0800 |
| commit | db869ffcdefc0fcbc97e9cea61ac21718ae4e2d4 (patch) | |
| tree | 3d79ecc95fcef072a670bd501d8bb6b8349739c4 /xmake/modules | |
| parent | 08cd8e8c27448cd9af15da9fcc645366456716ba (diff) | |
improve package
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/private/action/require/impl/package.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/private/action/require/impl/utils/requirekey.lua | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index 0cbdb9093..04557715c 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -580,6 +580,7 @@ function _get_packagekey(packagename, requireinfo, version) return _get_requirekey(requireinfo, {name = packagename, plat = requireinfo.plat, arch = requireinfo.arch, + kind = requireinfo.kind, version = version or requireinfo.version}) end @@ -991,6 +992,9 @@ function get_configs_str(package) if requireinfo.arch then table.insert(configs, requireinfo.arch) end + if requireinfo.kind then + table.insert(configs, requireinfo.kind) + end for k, v in pairs(requireinfo.configs) do if type(v) == "boolean" then table.insert(configs, k .. ":" .. (v and "y" or "n")) diff --git a/xmake/modules/private/action/require/impl/utils/requirekey.lua b/xmake/modules/private/action/require/impl/utils/requirekey.lua index 330f5a961..fdd0f43da 100644 --- a/xmake/modules/private/action/require/impl/utils/requirekey.lua +++ b/xmake/modules/private/action/require/impl/utils/requirekey.lua @@ -31,6 +31,9 @@ function main(requireinfo, opt) if opt.arch then key = key .. "/" .. opt.arch end + if opt.kind then + key = key .. "/" .. opt.kind + end if opt.version then key = key .. "/" .. opt.version end |