summaryrefslogtreecommitdiff
path: root/xmake/modules/private/action/require/impl/package.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2021-04-01 00:29:36 +0800
committerruki <[email protected]>2021-04-01 00:29:36 +0800
commit2ff98566ce46f45b36da9f58e3da4def548814f8 (patch)
tree084862647b1c18bd2d624ec1e168f062de114816 /xmake/modules/private/action/require/impl/package.lua
parentf7567574c955e34bf20f5e311241fc0f3b3c72d5 (diff)
support to set system for add_deps
Diffstat (limited to 'xmake/modules/private/action/require/impl/package.lua')
-rw-r--r--xmake/modules/private/action/require/impl/package.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 7688fb283..6d633875c 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -506,7 +506,11 @@ function _load_package(packagename, requireinfo, opt)
end
-- load package from system
- if not package and opt.system ~= false then
+ local system = requireinfo.system
+ if system == nil then
+ system = opt.system
+ end
+ if not package and system ~= false then
package = _load_package_from_system(packagename)
end