summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-07-09 22:52:11 +0800
committerruki <[email protected]>2024-07-09 22:52:11 +0800
commit3f3fc063d40ca7114e21b511bb033d048a7af963 (patch)
treed28c94375d09e975ab0291abb82c7264076262e9
parentcbb8f14330263b94a467102ae96c2ae00f79ce33 (diff)
improve to find ifx
-rw-r--r--xmake/modules/detect/sdks/find_ifxenv.lua9
-rw-r--r--xmake/modules/detect/tools/find_ifx.lua2
-rw-r--r--xmake/toolchains/ifx/xmake.lua6
3 files changed, 9 insertions, 8 deletions
diff --git a/xmake/modules/detect/sdks/find_ifxenv.lua b/xmake/modules/detect/sdks/find_ifxenv.lua
index 2c327b70b..75630d2a0 100644
--- a/xmake/modules/detect/sdks/find_ifxenv.lua
+++ b/xmake/modules/detect/sdks/find_ifxenv.lua
@@ -93,7 +93,7 @@ function _load_ifxvars(ifxvars_bat, arch, opt)
return variables
end
--- find intel llvm c/c++ envirnoment on windows
+-- find intel llvm fortran envirnoment on windows
function _find_intel_on_windows(opt)
opt = opt or {}
@@ -102,7 +102,7 @@ function _find_intel_on_windows(opt)
local ifxvars_bat = find_file("setvars.bat", paths)
if not ifxvars_bat then
paths = {}
- local keys = winos.registry_keys("HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\Intel\\DPCPPSuites\\**\\DPC++")
+ local keys = winos.registry_keys("HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\Intel\\Compilers\\Fortran\\**")
for _, key in ipairs(keys) do
table.insert(paths, format("$(reg %s;ProductDir)", key))
end
@@ -115,7 +115,7 @@ function _find_intel_on_windows(opt)
end
end
--- find intel llvm c/c++ envirnoment on linux
+-- find intel llvm fortran envirnoment on linux
function _find_intel_on_linux(opt)
-- attempt to find the sdk directory
@@ -135,7 +135,7 @@ function _find_intel_on_linux(opt)
end
end
--- find intel c/c++ environment
+-- find intel fortran environment
function main(opt)
if is_host("windows") then
return _find_intel_on_windows(opt)
@@ -143,3 +143,4 @@ function main(opt)
return _find_intel_on_linux(opt)
end
end
+
diff --git a/xmake/modules/detect/tools/find_ifx.lua b/xmake/modules/detect/tools/find_ifx.lua
index a59a02927..d6225d67f 100644
--- a/xmake/modules/detect/tools/find_ifx.lua
+++ b/xmake/modules/detect/tools/find_ifx.lua
@@ -37,7 +37,7 @@ import("lib.detect.find_programver")
--
function main(opt)
opt = opt or {}
- local program = find_program(opt.program or "icx", opt)
+ local program = find_program(opt.program or "ifx", opt)
local version = nil
if program and opt.version then
version = find_programver(program, opt)
diff --git a/xmake/toolchains/ifx/xmake.lua b/xmake/toolchains/ifx/xmake.lua
index d853d2b9c..463d6936e 100644
--- a/xmake/toolchains/ifx/xmake.lua
+++ b/xmake/toolchains/ifx/xmake.lua
@@ -19,11 +19,11 @@
--
-- define toolchain
-toolchain("icx")
+toolchain("ifx")
-- set homepage
- set_homepage("https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html")
- set_description("Intel LLVM C/C++ Compiler")
+ set_homepage("https://www.intel.com/content/www/us/en/developer/articles/tool/oneapi-standalone-components.html#fortran")
+ set_description("Intel LLVM Fortran Compiler")
-- mark as standalone toolchain
set_kind("standalone")