diff options
| author | ruki <[email protected]> | 2016-06-22 21:55:55 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-06-22 21:55:55 +0800 |
| commit | 920ba6e7d186b71d48efefe130e99ebc398beca4 (patch) | |
| tree | 8904606b7548ca7c4b5c418fe428392ba5acc9de | |
| parent | 17c6d2e9cb797780e8d89a729d23fa3a52f5384f (diff) | |
fix auto-config bug
| -rw-r--r-- | xmake/core/project/cache.lua | 3 | ||||
| -rw-r--r-- | xmake/core/project/global.lua | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xmake/core/project/cache.lua b/xmake/core/project/cache.lua index 1a81ee4dc..ce47fa977 100644 --- a/xmake/core/project/cache.lua +++ b/xmake/core/project/cache.lua @@ -105,6 +105,9 @@ end -- flush to cache file function cache:flush() + -- flush the version + self._CACHEDATA.__version = xmake._VERSION_SHORT + -- save to file return io.save(self._CACHEPATH, self._CACHEDATA) end diff --git a/xmake/core/project/global.lua b/xmake/core/project/global.lua index 4649139b5..b319b12f4 100644 --- a/xmake/core/project/global.lua +++ b/xmake/core/project/global.lua @@ -71,7 +71,7 @@ function global.options() -- remove values with "auto" and private item local configs = {} for name, value in pairs(table.wrap(global._CONFIGS)) do - if not name:find("^_%u+") and (type(value) ~= "string" or value ~= "auto") then + if not name:find("^_%u+") and name ~= "__version" and (type(value) ~= "string" or value ~= "auto") then configs[name] = value end end |