Merge pull request #1898 from xmake-io/ifort

improve ifort

3 files changed, 40 insertions, 17 deletions

diff --git a/xmake/modules/detect/sdks/find_iccenv.lua b/xmake/modules/detect/sdks/find_iccenv.lua
index 0e432a99c..2eb2c353c 100644
--- a/xmake/modules/detect/sdks/find_iccenv.lua
+++ b/xmake/modules/detect/sdks/find_iccenv.lua
@@ -102,6 +102,11 @@ function _find_intel_on_windows(opt)
     -- find iclvars_bat.bat
     local paths = {"$(env ICPP_COMPILER20)"}
     local iclvars_bat = find_file("bin/iclvars.bat", paths)
+    -- look for setvars.bat which is new in 2021
+    if not iclvars_bat then
+        paths = {"$(env ICPP_COMPILER21)"}
+        iclvars_bat = find_file("../../../setvars.bat", paths)
+    end
     if iclvars_bat then
 
         -- load iclvars_bat
@@ -123,6 +128,22 @@ function _find_intel_on_linux(opt)
         local sdkdir = path.directory(path.directory(icc))
         return {sdkdir = sdkdir, bindir = path.directory(icc), path.join(sdkdir, "include"), libdir = path.join(sdkdir, "lib")}
     end
+
+    -- find it from oneapi sdk directory
+    local oneapi_rootdirs = {"~/intel/oneapi/compiler", "/opt/intel/oneapi/compiler"}
+    local arch = os.arch() == "x86_64" and "intel64" or "ia32"
+    paths = {}
+    for _, rootdir in ipairs(oneapi_rootdirs) do
+        table.insert(paths, path.join(rootdir, "*", is_host("macosx") and "mac" or "linux", "bin", arch))
+    end
+    if #paths > 0 then
+        local icc = find_file("icc", paths)
+        if icc then
+            local bindir = path.directory(icc)
+            local sdkdir = path.directory(bindir)
+            return {sdkdir = sdkdir, bindir = bindir, libdir = path.join(sdkdir, "compiler", "lib", arch)}
+        end
+    end
 end
 
 -- find intel c/c++ environment
diff --git a/xmake/modules/detect/sdks/find_ifortenv.lua b/xmake/modules/detect/sdks/find_ifortenv.lua
index 42f29c6a0..131c4b930 100644
--- a/xmake/modules/detect/sdks/find_ifortenv.lua
+++ b/xmake/modules/detect/sdks/find_ifortenv.lua
@@ -122,12 +122,28 @@ end
 -- find intel fortran envirnoment on linux
 function _find_intel_on_linux(opt)
 
-    -- attempt to find the sdk directory
     local paths = {"/opt/intel/bin", "/usr/local/bin", "/usr/bin"}
     local ifort = find_file("ifort", paths)
     if ifort then
-        local sdkdir = path.directory(path.directory(ifort))
-        return {sdkdir = sdkdir, bindir = path.directory(ifort), path.join(sdkdir, "include"), libdir = path.join(sdkdir, "lib")}
+        local bindir = path.directory(ifort)
+        local sdkdir = path.directory(bindir)
+        return {sdkdir = sdkdir, bindir = bindir, libdir = path.join(sdkdir, "lib")}
+    end
+
+    -- find it from oneapi sdk directory
+    local oneapi_rootdirs = {"~/intel/oneapi/compiler", "/opt/intel/oneapi/compiler"}
+    local arch = os.arch() == "x86_64" and "intel64" or "ia32"
+    paths = {}
+    for _, rootdir in ipairs(oneapi_rootdirs) do
+        table.insert(paths, path.join(rootdir, "*", is_host("macosx") and "mac" or "linux", "bin", arch))
+    end
+    if #paths > 0 then
+        local ifort = find_file("ifort", paths)
+        if ifort then
+            local bindir = path.directory(ifort)
+            local sdkdir = path.directory(bindir)
+            return {sdkdir = sdkdir, bindir = bindir, libdir = path.join(sdkdir, "compiler", "lib", arch)}
+        end
     end
 end
 
diff --git a/xmake/modules/detect/tools/find_ifort.lua b/xmake/modules/detect/tools/find_ifort.lua
index dfa8f254c..31f158996 100644
--- a/xmake/modules/detect/tools/find_ifort.lua
+++ b/xmake/modules/detect/tools/find_ifort.lua
@@ -52,20 +52,6 @@ function main(opt)
         return program, version
     else
         -- find program
-        if is_host("linux") then
-            local arch = os.arch() == "x86_64" and "intel64" or "ia32"
-            local dirs = {"~/intel/oneapi/compiler/latest/linux"}
-            opt.envs = opt.envs or {}
-            opt.paths = opt.paths or {}
-            local LD_LIBRARY_PATH = {}
-            for _, dir in ipairs(dirs) do
-                if os.isdir(dir) then
-                    table.insert(LD_LIBRARY_PATH, path.join(dir, "compiler/lib", arch))
-                    table.insert(opt.paths, path.join(dir, "bin", arch))
-                end
-            end
-            opt.envs.LD_LIBRARY_PATH = path.joinenv(LD_LIBRARY_PATH)
-        end
         local program = find_program(opt.program or "ifort", opt)
 
         -- find program version