diff options
author | Brad King <brad.king@kitware.com> | 2021-03-09 14:15:35 +0000 |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-09 09:15:43 -0500 |
commit | 22909e0defc94f5b3573be1f5ca4b4a119dacade (patch) | |
tree | d79e9c71f32e9cec4a94e977f70eac79f1e45676 /Modules/CMakeFortranCompilerId.F.in | |
parent | 155ec56c9f2d9593527f01c300ed994cf317909f (diff) | |
parent | 23b101de601491342f1b918ee29114d7f66d2ad9 (diff) | |
download | cmake-22909e0defc94f5b3573be1f5ca4b4a119dacade.tar.gz |
Merge topic 'CrayPrgEnv-detection' into release-3.20
23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5889
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 1cc08dfe81..34d4da6c8b 100644 --- a/Modules/CMakeFortranCompilerId.F.in +++ b/Modules/CMakeFortranCompilerId.F.in @@ -139,7 +139,7 @@ #else PRINT *, 'INFO:compiler[]' #endif -#if defined(_CRAYFTN) +#if defined(__CRAYXE) || defined(__CRAYXC) PRINT *, 'INFO:compiler_wrapper[CrayPrgEnv]' #endif |