rename vcvars_ver to toolset

7 files changed, 17 insertions, 17 deletions

diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua
index 2b78b17c0..d48a7af53 100644
--- a/xmake/modules/detect/sdks/find_vstudio.lua
+++ b/xmake/modules/detect/sdks/find_vstudio.lua
@@ -234,16 +234,16 @@ function _load_vcvarsall(vcvarsall, vsver, arch, opt)
     local host_arch = os.arch()
     if is_vsdevcmd then
         if vsver and tonumber(vsver) >= 16 then
-            if opt.vcvars_ver then
-                file:print("call \"%s\" -host_arch=%s -arch=%s -winsdk=%s -vcvars_ver=%s > nul", vcvarsall, host_arch, arch, opt.sdkver and opt.sdkver or "", opt.vcvars_ver)
+            if opt.toolset then
+                file:print("call \"%s\" -host_arch=%s -arch=%s -winsdk=%s -vcvars_ver=%s > nul", vcvarsall, host_arch, arch, opt.sdkver or "", opt.toolset or opt.vcvars_ver or "")
             else
                 file:print("call \"%s\" -host_arch=%s -arch=%s -winsdk=%s > nul", vcvarsall, host_arch, arch, opt.sdkver and opt.sdkver or "")
             end
         else
-            if opt.vcvars_ver then
-                file:print("call \"%s\" -arch=%s -winsdk=%s -vcvars_ver=%s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "", opt.vcvars_ver)
+            if opt.toolset then
+                file:print("call \"%s\" -arch=%s -winsdk=%s -vcvars_ver=%s > nul", vcvarsall, arch, opt.sdkver or "", opt.toolset or opt.vcvars_ver or "")
             else
-                file:print("call \"%s\" -arch=%s -winsdk=%s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "")
+                file:print("call \"%s\" -arch=%s -winsdk=%s > nul", vcvarsall, arch, opt.sdkver or "")
             end
         end
     else
@@ -254,10 +254,10 @@ function _load_vcvarsall(vcvarsall, vsver, arch, opt)
             end
             arch = host_arch .. "_" .. arch
         end
-        if opt.vcvars_ver then
-            file:print("call \"%s\" %s %s -vcvars_ver=%s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "", opt.vcvars_ver)
+        if opt.toolset then
+            file:print("call \"%s\" %s %s -vcvars_ver=%s > nul", vcvarsall, arch, opt.sdkver or "", opt.toolset or opt.vcvars_ver or "")
         else
-            file:print("call \"%s\" %s %s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "")
+            file:print("call \"%s\" %s %s > nul", vcvarsall, arch, opt.sdkver or "")
         end
     end
     for idx, var in ipairs(get_vcvars()) do
@@ -578,7 +578,7 @@ end
 
 -- find vstudio environment
 --
--- @param opt   the options, e.g. {vcvars_ver = 14.0, sdkver = "10.0.15063.0"}
+-- @param opt   the options, e.g. {toolset = 14.0, sdkver = "10.0.15063.0"}
 --
 -- @return      { 2008 = {version = "9.0", vcvarsall = {x86 = {path = .., lib = .., include = ..}}}
 --              , 2017 = {version = "15.0", vcvarsall = {x64 = {path = .., lib = ..}}}}
@@ -592,8 +592,8 @@ function main(opt)
     end
 
     local key = "vstudio"
-    if opt.vcvars_ver then
-        key = key .. opt.vcvars_ver
+    if opt.toolset then
+        key = key .. opt.toolset
     end
     if opt.sdkver then
         key = key .. opt.sdkver
diff --git a/xmake/toolchains/clang-cl/check.lua b/xmake/toolchains/clang-cl/check.lua
index 4537f01e3..ca0bbfd88 100644
--- a/xmake/toolchains/clang-cl/check.lua
+++ b/xmake/toolchains/clang-cl/check.lua
@@ -49,7 +49,7 @@ function _check_vsenv(toolchain)
     -- find vstudio
     local vs_toolset = toolchain:config("vs_toolset") or config.get("vs_toolset")
     local vs_sdkver  = toolchain:config("vs_sdkver") or config.get("vs_sdkver")
-    local vstudio = find_vstudio({vcvars_ver = vs_toolset, sdkver = vs_sdkver})
+    local vstudio = find_vstudio({toolset = vs_toolset, sdkver = vs_sdkver})
     if vstudio then
 
         -- make order vsver
diff --git a/xmake/toolchains/icc/check.lua b/xmake/toolchains/icc/check.lua
index ece7f1292..de2b30c89 100644
--- a/xmake/toolchains/icc/check.lua
+++ b/xmake/toolchains/icc/check.lua
@@ -41,7 +41,7 @@ function _check_vsenv(toolchain)
     -- find vstudio
     local vs_toolset = toolchain:config("vs_toolset") or config.get("vs_toolset")
     local vs_sdkver  = toolchain:config("vs_sdkver") or config.get("vs_sdkver")
-    local vstudio = find_vstudio({vcvars_ver = vs_toolset, sdkver = vs_sdkver})
+    local vstudio = find_vstudio({toolset = vs_toolset, sdkver = vs_sdkver})
     if vstudio then
 
         -- make order vsver
diff --git a/xmake/toolchains/icx/check.lua b/xmake/toolchains/icx/check.lua
index 30afed6f6..247e1dbfe 100644
--- a/xmake/toolchains/icx/check.lua
+++ b/xmake/toolchains/icx/check.lua
@@ -41,7 +41,7 @@ function _check_vsenv(toolchain)
     -- find vstudio
     local vs_toolset = toolchain:config("vs_toolset") or config.get("vs_toolset")
     local vs_sdkver  = toolchain:config("vs_sdkver") or config.get("vs_sdkver")
-    local vstudio = find_vstudio({vcvars_ver = vs_toolset, sdkver = vs_sdkver})
+    local vstudio = find_vstudio({toolset = vs_toolset, sdkver = vs_sdkver})
     if vstudio then
 
         -- make order vsver
diff --git a/xmake/toolchains/ifort/check.lua b/xmake/toolchains/ifort/check.lua
index 2c8b52c5b..682060f08 100644
--- a/xmake/toolchains/ifort/check.lua
+++ b/xmake/toolchains/ifort/check.lua
@@ -41,7 +41,7 @@ function _check_vsenv(toolchain)
     -- find vstudio
     local vs_toolset = toolchain:config("vs_toolset") or config.get("vs_toolset")
     local vs_sdkver  = toolchain:config("vs_sdkver") or config.get("vs_sdkver")
-    local vstudio = find_vstudio({vcvars_ver = vs_toolset, sdkver = vs_sdkver})
+    local vstudio = find_vstudio({toolset = vs_toolset, sdkver = vs_sdkver})
     if vstudio then
 
         -- make order vsver
diff --git a/xmake/toolchains/ifx/check.lua b/xmake/toolchains/ifx/check.lua
index e4bed2706..02d209c09 100644
--- a/xmake/toolchains/ifx/check.lua
+++ b/xmake/toolchains/ifx/check.lua
@@ -41,7 +41,7 @@ function _check_vsenv(toolchain)
     -- find vstudio
     local vs_toolset = toolchain:config("vs_toolset") or config.get("vs_toolset")
     local vs_sdkver  = toolchain:config("vs_sdkver") or config.get("vs_sdkver")
-    local vstudio = find_vstudio({vcvars_ver = vs_toolset, sdkver = vs_sdkver})
+    local vstudio = find_vstudio({toolset = vs_toolset, sdkver = vs_sdkver})
     if vstudio then
 
         -- make order vsver
diff --git a/xmake/toolchains/msvc/check.lua b/xmake/toolchains/msvc/check.lua
index c40d4a202..c2ed4bbb6 100644
--- a/xmake/toolchains/msvc/check.lua
+++ b/xmake/toolchains/msvc/check.lua
@@ -40,7 +40,7 @@ function _check_vsenv(toolchain)
     -- find vstudio
     local vs_toolset = toolchain:config("vs_toolset") or config.get("vs_toolset")
     local vs_sdkver  = toolchain:config("vs_sdkver") or config.get("vs_sdkver")
-    local vstudio = find_vstudio({vcvars_ver = vs_toolset, sdkver = vs_sdkver})
+    local vstudio = find_vstudio({toolset = vs_toolset, sdkver = vs_sdkver})
     if vstudio then
 
         -- make order vsver