diff options
| author | PucklaMotzer09 <[email protected]> | 2021-12-07 12:29:26 +0100 |
|---|---|---|
| committer | PucklaMotzer09 <[email protected]> | 2021-12-07 12:33:03 +0100 |
| commit | b17b42b8130a7b736c2668cc37445234c9e8301f (patch) | |
| tree | 29d0984d13cab2a51255d32fa8c9bab6b7ded69d | |
| parent | 9d19f1a747c0ebf692fbeca25a78f41b7fcd55e3 (diff) | |
Use correct path and bat for ifort 2021
| -rw-r--r-- | xmake/modules/detect/sdks/find_ifortenv.lua | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/xmake/modules/detect/sdks/find_ifortenv.lua b/xmake/modules/detect/sdks/find_ifortenv.lua index f3aafad06..6d4b32b7d 100644 --- a/xmake/modules/detect/sdks/find_ifortenv.lua +++ b/xmake/modules/detect/sdks/find_ifortenv.lua @@ -100,8 +100,14 @@ function _find_intel_on_windows(opt) opt = opt or {} -- find ifortvars_bat.bat - local paths = {"$(env IFORT_COMPILER20)"} + local paths = {os.getenv("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 = {os.getenv("IFORT_COMPILER21")} + ifortvars_bat = find_file("../../../setvars.bat", paths) + end + if ifortvars_bat then -- load ifortvars_bat |