diff options
| author | ruki <[email protected]> | 2021-12-08 22:38:17 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-08 22:38:17 +0800 |
| commit | 10a3e5bc3ac87081d20b978a0a5eada4a6db17fe (patch) | |
| tree | b7f97368f91f9f2e9f88fb63ebef2c9ce737d4f6 | |
| parent | d35c013b15bdd24b31665d1c812115075bbd926c (diff) | |
| parent | 9ba620afb2edd9af07f84cc9cdbcd06b39dde29b (diff) | |
Merge pull request #1892 from PucklaMotzer09/ifort_fix
Fix detecting of Intel Fortran Compiler 2021 on Windows
| -rw-r--r-- | xmake/modules/detect/sdks/find_ifortenv.lua | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xmake/modules/detect/sdks/find_ifortenv.lua b/xmake/modules/detect/sdks/find_ifortenv.lua index f3aafad06..42f29c6a0 100644 --- a/xmake/modules/detect/sdks/find_ifortenv.lua +++ b/xmake/modules/detect/sdks/find_ifortenv.lua @@ -102,6 +102,12 @@ 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) + end + if ifortvars_bat then -- load ifortvars_bat |