summaryrefslogtreecommitdiff
path: root/xmake/scripts/base/project.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-15 22:48:05 +0800
committerruki <[email protected]>2015-06-15 22:48:05 +0800
commit60bd22effb5664fefafabe69f5023301b6970e7b (patch)
tree1becb00719df6d92334f8a6cca14e1358f3d3d4b /xmake/scripts/base/project.lua
parent5aa1e3e13876809ff14264429ad98fa3d5457b99 (diff)
fix run arguments bug
Diffstat (limited to 'xmake/scripts/base/project.lua')
-rw-r--r--xmake/scripts/base/project.lua17
1 files changed, 9 insertions, 8 deletions
diff --git a/xmake/scripts/base/project.lua b/xmake/scripts/base/project.lua
index 5e5318236..0d2c465b8 100644
--- a/xmake/scripts/base/project.lua
+++ b/xmake/scripts/base/project.lua
@@ -89,14 +89,15 @@ function project._api_archs(env, ...)
end
end
--- enable option?
-function project._api_option(env, name)
+-- enable options?
+function project._api_options(env, ...)
- -- check
- assert(name)
-
- -- enable?
- return config.get(name)
+ -- some options are enabled?
+ for _, o in ipairs(table.join(...)) do
+ if o and type(o) == "string" and config.get(o) then
+ return true
+ end
+ end
end
-- add target
@@ -791,7 +792,7 @@ function project._load_targets(file)
newenv.modes = function (...) return project._api_modes(newenv, ...) end
newenv.plats = function (...) return project._api_plats(newenv, ...) end
newenv.archs = function (...) return project._api_archs(newenv, ...) end
- newenv.option = function (...) return project._api_option(newenv, ...) end
+ newenv.options = function (...) return project._api_options(newenv, ...) end
-- register interfaces for the target
newenv.set_target = function (...) return project._api_add_target(newenv, ...) end