summaryrefslogtreecommitdiff
path: root/xmake/core/project/config.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2017-07-19 08:39:04 +0800
committerruki <[email protected]>2017-07-19 08:39:04 +0800
commitbfe4432515a8816edc1d32ccfe646096b3ff9c95 (patch)
tree9dd3a14003bb8aed40fd392e6bffbe10e2e8145a /xmake/core/project/config.lua
parent7910713ed804fb60fa8f13b0a4ce915347fc879a (diff)
improve global action
Diffstat (limited to 'xmake/core/project/config.lua')
-rw-r--r--xmake/core/project/config.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/xmake/core/project/config.lua b/xmake/core/project/config.lua
index 235118146..643665173 100644
--- a/xmake/core/project/config.lua
+++ b/xmake/core/project/config.lua
@@ -144,18 +144,20 @@ function config.load(targetname)
local results, errors = config._load(targetname)
if not results then
utils.error(errors)
- return true
+ return false
end
-- merge the target configure first
+ local ok = false
for name, value in pairs(results) do
if config.get(name) == nil then
config.set(name, value)
+ ok = true
end
end
- -- ok
- return true
+ -- ok?
+ return ok
end
-- save the project configure