Merge pull request #2052 from SirLynix/patch-10

Fix vs generator config

1 files changed, 4 insertions, 8 deletions

diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua
index ee0316071..b72827e0b 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x.lua
@@ -91,11 +91,14 @@ end
 
 -- clear cache
 function _clear_cache()
-    localcache.clear("config")
     localcache.clear("detect")
     localcache.clear("option")
     localcache.clear("package")
     localcache.clear("toolchain")
+
+    -- force recheck
+    localcache.set("config", "recheck", true)
+
     localcache.save()
 end
 
@@ -499,7 +502,6 @@ function make(outputdir, vsinfo)
 
     -- load targets
     local targets = {}
-    local configdata = io.readfile(config.filepath())
     for mode_idx, mode in ipairs(vsinfo.modes) do
         for arch_idx, arch in ipairs(vsinfo.archs) do
 
@@ -521,7 +523,6 @@ function make(outputdir, vsinfo)
 
                 -- clear cache
                 memcache.clear()
-                localcache.clear("config")
                 localcache.clear("detect")
                 localcache.clear("option")
                 localcache.clear("package")
@@ -592,11 +593,6 @@ function make(outputdir, vsinfo)
     -- clear local cache
     _clear_cache()
 
-    -- restore previous config data
-    if configdata then
-        io.writefile(config.filepath(), configdata)
-    end
-
     -- leave project directory
     os.cd(oldir)
 end