improve icl envs

3 files changed, 132 insertions, 11 deletions

diff --git a/xmake/toolchains/icc/check.lua b/xmake/toolchains/icc/check.lua
index 9dde538f0..9ca496a63 100644
--- a/xmake/toolchains/icc/check.lua
+++ b/xmake/toolchains/icc/check.lua
@@ -22,8 +22,90 @@
 import("core.base.option")
 import("core.project.config")
 import("detect.sdks.find_iccenv")
+import("detect.sdks.find_vstudio")
 import("lib.detect.find_tool")
 
+-- attempt to check vs environment
+function _check_vsenv(toolchain)
+
+    -- has been checked?
+    local vs = toolchain:config("vs") or config.get("vs")
+    if vs then
+        vs = tostring(vs)
+    end
+    local vcvars = toolchain:config("vcvars")
+    if vs and vcvars then
+        return vs
+    end
+
+    -- 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})
+    if vstudio then
+
+        -- make order vsver
+        local vsvers = {}
+        for vsver, _ in pairs(vstudio) do
+            if not vs or vs ~= vsver then
+                table.insert(vsvers, vsver)
+            end
+        end
+        table.sort(vsvers, function (a, b) return tonumber(a) > tonumber(b) end)
+        if vs then
+            table.insert(vsvers, 1, vs)
+        end
+
+        -- get vcvarsall
+        for _, vsver in ipairs(vsvers) do
+            local vcvarsall = (vstudio[vsver] or {}).vcvarsall or {}
+            local vcvars = vcvarsall[toolchain:arch()]
+            if vcvars and vcvars.PATH and vcvars.INCLUDE and vcvars.LIB then
+
+                -- save vcvars
+                toolchain:config_set("vcvars", vcvars)
+                toolchain:config_set("vcarchs", table.orderkeys(vcvarsall))
+                toolchain:config_set("vs_toolset", vcvars.VCToolsVersion)
+                toolchain:config_set("vs_sdkver", vcvars.WindowsSDKVersion)
+
+                -- check compiler
+                local program
+                local paths
+                local pathenv = os.getenv("PATH")
+                if pathenv then
+                    paths = path.splitenv(pathenv)
+                end
+                local tool = find_tool("cl.exe", {version = true, force = true, paths = paths, envs = vcvars})
+                if tool then
+                    program = tool.program
+                end
+                if program then
+                    return vsver, tool
+                end
+            end
+        end
+    end
+end
+
+-- check the visual studio
+function _check_vstudio(toolchain)
+    local vs, cl = _check_vsenv(toolchain)
+    if vs then
+        if toolchain:is_global() then
+            config.set("vs", vs, {force = true, readonly = true})
+        end
+        toolchain:config_set("vs", vs)
+        toolchain:configs_save()
+        cprint("checking for Microsoft Visual Studio (%s) version ... ${color.success}%s", toolchain:arch(), vs)
+        if cl and cl.version then
+            cprint("checking for LLVM Clang C/C++ Compiler (%s) version ... ${color.success}%s", toolchain:arch(), cl.version)
+        end
+    else
+        cprint("checking for Microsoft Visual Studio (%s) version ... ${color.nothing}${text.nothing}", toolchain:arch())
+    end
+    return vs
+end
+
 -- check intel on windows
 function _check_intel_on_windows(toolchain)
 
@@ -44,7 +126,7 @@ function _check_intel_on_windows(toolchain)
                 cprint("checking for Intel C/C++ Compiler (%s) ... ${color.success}${text.success}", toolchain:arch())
                 toolchain:config_set("varsall", iclvarsall)
                 toolchain:configs_save()
-                return true
+                return _check_vstudio(toolchain)
             end
         end
     end
diff --git a/xmake/toolchains/icc/load.lua b/xmake/toolchains/icc/load.lua
index e1ceba260..21cb0170b 100644
--- a/xmake/toolchains/icc/load.lua
+++ b/xmake/toolchains/icc/load.lua
@@ -21,9 +21,34 @@
 -- imports
 import("core.base.option")
 import("core.project.config")
+import("detect.sdks.find_vstudio")
+
+-- add the given vs environment
+function _add_vsenv(toolchain, name, curenvs)
+
+    -- get vcvars
+    local vcvars = toolchain:config("vcvars")
+    if not vcvars then
+        return
+    end
+
+    -- get the paths for the vs environment
+    local new = vcvars[name]
+    if new then
+        -- fix case naming conflict for cmake/msbuild between the new msvc envs and current environment, if we are running xmake in vs prompt.
+        -- @see https://github.com/xmake-io/xmake/issues/4751
+        for k, c in pairs(curenvs) do
+            if name:lower() == k:lower() and name ~= k then
+                name = k
+                break
+            end
+        end
+        toolchain:add("runenvs", name, table.unpack(path.splitenv(new)))
+    end
+end
 
 -- add the given icl environment
-function _add_iclenv(toolchain, name)
+function _add_iclenv(toolchain, name, curenvs)
 
     -- get iclvarsall
     local iclvarsall = toolchain:config("varsall")
@@ -36,9 +61,17 @@ function _add_iclenv(toolchain, name)
     local iclenv = iclvarsall[arch] or {}
 
     -- get the paths for the icl environment
-    local env = iclenv[name]
-    if env then
-        toolchain:add("runenvs", name:upper(), path.splitenv(env))
+    local new = iclenv[name]
+    if new then
+        -- fix case naming conflict for cmake/msbuild between the new msvc envs and current environment, if we are running xmake in vs prompt.
+        -- @see https://github.com/xmake-io/xmake/issues/4751
+        for k, c in pairs(curenvs) do
+            if name:lower() == k:lower() and name ~= k then
+                name = k
+                break
+            end
+        end
+        toolchain:add("runenvs", name, table.unpack(path.splitenv(new)))
     end
 end
 
@@ -68,11 +101,18 @@ function _load_intel_on_windows(toolchain)
         toolchain:set("toolset", "as", "icc")
     end
 
-    -- add icl environments
-    _add_iclenv(toolchain, "PATH")
-    _add_iclenv(toolchain, "LIB")
-    _add_iclenv(toolchain, "INCLUDE")
-    _add_iclenv(toolchain, "LIBPATH")
+    -- add vs/icl environments
+    local expect_vars = {"PATH", "LIB", "INCLUDE", "LIBPATH"}
+    local curenvs = os.getenvs()
+    for _, name in ipairs(expect_vars) do
+        _add_vsenv(toolchain, name, curenvs)
+        _add_iclenv(toolchain, name, curenvs)
+    end
+    for _, name in ipairs(find_vstudio.get_vcvars()) do
+        if not table.contains(expect_vars, name:upper()) then
+            _add_vsenv(toolchain, name, curenvs)
+        end
+    end
 end
 
 -- load intel on linux
diff --git a/xmake/toolchains/icx/check.lua b/xmake/toolchains/icx/check.lua
index d2d7b2df9..c65e3ff81 100644
--- a/xmake/toolchains/icx/check.lua
+++ b/xmake/toolchains/icx/check.lua
@@ -106,7 +106,6 @@ function _check_vstudio(toolchain)
     return vs
 end
 
-
 -- check intel on windows
 function _check_intel_on_windows(toolchain)