summaryrefslogtreecommitdiff
path: root/xmake/actions/require/install.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2017-09-09 00:36:21 +0800
committerruki <[email protected]>2017-09-08 21:38:11 +0800
commit7755ecd8b9b751cfec483bb16d30a4764f1aad14 (patch)
tree7eda71dec5ddd5beb285806e4dc05e04f0581f7f /xmake/actions/require/install.lua
parentefd2ebdcc6c0e278068a9090e7b62af9c2727284 (diff)
impl optional package
Diffstat (limited to 'xmake/actions/require/install.lua')
-rw-r--r--xmake/actions/require/install.lua7
1 files changed, 5 insertions, 2 deletions
diff --git a/xmake/actions/require/install.lua b/xmake/actions/require/install.lua
index 4c4c91901..37218ed67 100644
--- a/xmake/actions/require/install.lua
+++ b/xmake/actions/require/install.lua
@@ -70,7 +70,10 @@ end
function main(requires)
-- init requires
- requires = requires or project.requires()
+ local requires_extra = nil
+ if not requires then
+ requires, requires_extra = project.requires()
+ end
if not requires or #requires == 0 then
return
end
@@ -85,7 +88,7 @@ function main(requires)
end
-- load packages
- local packages = package.load_packages(requires)
+ local packages = package.load_packages(requires, requires_extra)
-- fetch packages from local first
local packages_remote = {}