summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/actions/config/menuconf.lua4
-rw-r--r--xmake/actions/global/menuconf.lua4
2 files changed, 6 insertions, 2 deletions
diff --git a/xmake/actions/config/menuconf.lua b/xmake/actions/config/menuconf.lua
index 479748cbb..da9a8c531 100644
--- a/xmake/actions/config/menuconf.lua
+++ b/xmake/actions/config/menuconf.lua
@@ -232,7 +232,6 @@ function app:_basic_configs(cache)
-- choice option?
local values = opt.values
if values then
- kind = "choice"
if type(values) == "function" then
values = values()
end
@@ -243,6 +242,9 @@ function app:_basic_configs(cache)
end
end
end
+ if values then
+ kind = "choice"
+ end
-- get description
local description = {}
diff --git a/xmake/actions/global/menuconf.lua b/xmake/actions/global/menuconf.lua
index 6a4b4875c..cbde98524 100644
--- a/xmake/actions/global/menuconf.lua
+++ b/xmake/actions/global/menuconf.lua
@@ -229,7 +229,6 @@ function app:_global_configs(cache)
-- choice option?
local values = opt.values
if values then
- kind = "choice"
if type(values) == "function" then
values = values()
end
@@ -240,6 +239,9 @@ function app:_global_configs(cache)
end
end
end
+ if values then
+ kind = "choice"
+ end
-- get description
local description = {}