diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-08 17:26:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-08 17:28:36 (GMT) |
| commit | 23b101de601491342f1b918ee29114d7f66d2ad9 (patch) | |
| tree | 76b464ca86511b1ca3e3948bd5abd8e834221c40 /Modules/CMakeFortranCompilerId.F.in | |
| parent | 0ecd9de6ddcaf951968d053ae491949d68d6175f (diff) | |
| download | CMake-23b101de601491342f1b918ee29114d7f66d2ad9.zip CMake-23b101de601491342f1b918ee29114d7f66d2ad9.tar.gz CMake-23b101de601491342f1b918ee29114d7f66d2ad9.tar.bz2 | |
Revert "Cray: Fix Cray compiler detection on new platforms"
The justification in commit 9ee4a42813 (Cray: Fix Cray compiler
detection on new platforms, 2020-12-01, v3.19.2~26^2) confuses detection
of the CrayPrgEnv with identification of the Cray compiler. The
change regressed detection of the CrayPrgEnv on non-Cray compilers.
Revert it pending further investigation into the original problem.
Fixes: #21894
Diffstat (limited to 'Modules/CMakeFortranCompilerId.F.in')
| -rw-r--r-- | Modules/CMakeFortranCompilerId.F.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in index 7e8828b..30f8d4c 100644 --- a/Modules/CMakeFortranCompilerId.F.in +++ b/Modules/CMakeFortranCompilerId.F.in @@ -108,7 +108,7 @@ #else PRINT *, 'INFO:compiler[]' #endif -#if defined(_CRAYFTN) +#if defined(__CRAYXE) || defined(__CRAYXC) PRINT *, 'INFO:compiler_wrapper[CrayPrgEnv]' #endif |