summaryrefslogtreecommitdiff
path: root/xmake/actions/require/impl/package.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2018-11-21 23:55:49 +0800
committerruki <[email protected]>2018-11-21 17:34:57 +0800
commite18261cb79944a7797e174816f345e4ed2a20d1d (patch)
treeebdb9c9ef321f0bf6641b3aad0c0aa6c67265181 /xmake/actions/require/impl/package.lua
parent6902984e5c200e03f0d9f4a99d0a0801ee1acabc (diff)
add requires info for project
Diffstat (limited to 'xmake/actions/require/impl/package.lua')
-rw-r--r--xmake/actions/require/impl/package.lua37
1 files changed, 16 insertions, 21 deletions
diff --git a/xmake/actions/require/impl/package.lua b/xmake/actions/require/impl/package.lua
index 814378276..b4eb3f7d3 100644
--- a/xmake/actions/require/impl/package.lua
+++ b/xmake/actions/require/impl/package.lua
@@ -243,31 +243,26 @@ function _load_packages(requires, opt)
local packages = {}
for packagename, requireinfo in pairs(load_requires(requires, opt.requires_extra, opt.parentinfo)) do
- -- attempt to get project option about this package
- local packageopt = os.isfile(os.projectfile()) and project.option(packagename) or nil
- if packageopt == nil or packageopt:enabled() then -- this package is enabled?
+ -- load package
+ local package = _load_package(packagename, requireinfo)
- -- load package package
- local package = _load_package(packagename, requireinfo)
-
- -- maybe package not found and optional
- if package then
+ -- maybe package not found and optional
+ if package then
- -- load dependent packages and save them first of this package
- local deps = package:get("deps")
- if deps and opt.nodeps ~= true then
- local packagedeps = {}
- for _, dep in ipairs(_load_packages(deps, {requires_extra = package:get("__extra_deps"), parentinfo = requireinfo, nodeps = opt.nodeps})) do
- table.insert(packages, dep)
- packagedeps[dep:name()] = dep
- end
- package._DEPS = packagedeps
- package._ORDERDEPS = table.unique(_sort_packagedeps(package))
+ -- load dependent packages and save them first of this package
+ local deps = package:get("deps")
+ if deps and opt.nodeps ~= true then
+ local packagedeps = {}
+ for _, dep in ipairs(_load_packages(deps, {requires_extra = package:get("__extra_deps"), parentinfo = requireinfo, nodeps = opt.nodeps})) do
+ table.insert(packages, dep)
+ packagedeps[dep:name()] = dep
end
-
- -- save this package package
- table.insert(packages, package)
+ package._DEPS = packagedeps
+ package._ORDERDEPS = table.unique(_sort_packagedeps(package))
end
+
+ -- save this package package
+ table.insert(packages, package)
end
end