load config

1 files changed, 5 insertions, 2 deletions

diff --git a/xmake/actions/global/xmake.lua b/xmake/actions/global/xmake.lua
index d93b6e524..35b36cda6 100755
--- a/xmake/actions/global/xmake.lua
+++ b/xmake/actions/global/xmake.lua
@@ -33,6 +33,9 @@ task("global")
         import("core.base.option")
         import("core.project.global")
 
+        -- load configure
+        global.load()
+
         -- clean the cached configure?
         if option.get("clean") then
             
@@ -40,7 +43,7 @@ task("global")
             global.clean()
         end
 
-        -- merge the options 
+        -- override the configure for the current options
         for name, value in pairs(option.options()) do
             if name ~= "verbose" and name ~= "clean" then
                 global.set(name, value)
@@ -49,7 +52,7 @@ task("global")
 
         -- merge the default options 
         for name, value in pairs(option.defaults()) do
-            if name ~= "verbose" and name ~= "clean" then
+            if name ~= "verbose" and name ~= "clean" and global.get(name) == nil then
                 global.set(name, value)
             end
         end