diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-09 14:15:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-09 14:15:43 (GMT) |
| commit | 22909e0defc94f5b3573be1f5ca4b4a119dacade (patch) | |
| tree | d79e9c71f32e9cec4a94e977f70eac79f1e45676 | |
| parent | 155ec56c9f2d9593527f01c300ed994cf317909f (diff) | |
| parent | 23b101de601491342f1b918ee29114d7f66d2ad9 (diff) | |
| download | CMake-22909e0defc94f5b3573be1f5ca4b4a119dacade.zip CMake-22909e0defc94f5b3573be1f5ca4b4a119dacade.tar.gz CMake-22909e0defc94f5b3573be1f5ca4b4a119dacade.tar.bz2 | |
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
| -rw-r--r-- | Modules/CMakeCCompilerId.c.in | 4 | ||||
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 4 | ||||
| -rw-r--r-- | Modules/CMakeFortranCompilerId.F.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index 8ba6abc..2f6bdb4 100644 --- a/Modules/CMakeCCompilerId.c.in +++ b/Modules/CMakeCCompilerId.c.in @@ -26,7 +26,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]"; char const* qnxnto = "INFO" ":" "qnxnto[]"; #endif -#if defined(_CRAYC) || defined(__cray__) +#if defined(__CRAYXE) || defined(__CRAYXC) char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; #endif @@ -77,7 +77,7 @@ int main(int argc, char* argv[]) #ifdef SIMULATE_VERSION_MAJOR require += info_simulate_version[argc]; #endif -#if defined(_CRAYC) || defined(__cray__) +#if defined(__CRAYXE) || defined(__CRAYXC) require += info_cray[argc]; #endif require += info_language_dialect_default[argc]; diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index 49d9f0a..c3517b5 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -20,7 +20,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]"; char const* qnxnto = "INFO" ":" "qnxnto[]"; #endif -#if defined(_CRAYC) || defined(__cray__) +#if defined(__CRAYXE) || defined(__CRAYXC) char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; #endif @@ -78,7 +78,7 @@ int main(int argc, char* argv[]) #ifdef SIMULATE_VERSION_MAJOR require += info_simulate_version[argc]; #endif -#if defined(_CRAYC) || defined(__cray__) +#if defined(__CRAYXE) || defined(__CRAYXC) require += info_cray[argc]; #endif require += info_language_dialect_default[argc]; diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in index 1cc08df..34d4da6 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 |