diff options
| author | indesperate <[email protected]> | 2022-12-27 14:39:24 +0800 |
|---|---|---|
| committer | indesperate <[email protected]> | 2022-12-27 14:40:47 +0800 |
| commit | 560955f0f8717e104fe77bef17f8d107b1446f80 (patch) | |
| tree | 38d03a431fd844550a3b40604ee29a8146efb9ba | |
| parent | c45903c76566cc8d477a7c9497f968056b18204f (diff) | |
add intel one api toolkits detection
fix #3206
| -rw-r--r-- | xmake/modules/detect/sdks/find_iccenv.lua | 6 | ||||
| -rw-r--r-- | xmake/modules/detect/sdks/find_ifortenv.lua | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xmake/modules/detect/sdks/find_iccenv.lua b/xmake/modules/detect/sdks/find_iccenv.lua index 84b40fade..be50d9ec5 100644 --- a/xmake/modules/detect/sdks/find_iccenv.lua +++ b/xmake/modules/detect/sdks/find_iccenv.lua @@ -102,10 +102,10 @@ 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) + -- find setvars.bat in intel oneapi toolkits rootdir + paths = {"$(env ONEAPI_ROOT)"} + iclvars_bat = find_file("setvars.bat", paths) end if iclvars_bat then diff --git a/xmake/modules/detect/sdks/find_ifortenv.lua b/xmake/modules/detect/sdks/find_ifortenv.lua index d851b3f6a..d7a5e5bee 100644 --- a/xmake/modules/detect/sdks/find_ifortenv.lua +++ b/xmake/modules/detect/sdks/find_ifortenv.lua @@ -102,10 +102,10 @@ function _find_intel_on_windows(opt) -- find ifortvars_bat.bat local paths = {"$(env IFORT_COMPILER20)"} local ifortvars_bat = find_file("bin/ifortvars.bat", paths) - -- look for setvars.bat which is new in 2021 if not ifortvars_bat then - paths = {"$(env IFORT_COMPILER21)"} - ifortvars_bat = find_file("../../../setvars.bat", paths) + -- find setvars.bat in intel oneapi toolkits rootdir + paths = {"$(env ONEAPI_ROOT)"} + ifortvars_bat = find_file("setvars.bat", paths) end if ifortvars_bat then |