diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-02 14:17:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-02 14:20:07 (GMT) |
| commit | 5f96bc9affc47036e95d75c14057c65cc030a4d1 (patch) | |
| tree | d59f459072e782cf6f75fd84d65cda2053dba749 | |
| parent | ab2fd7a117c8a9eba5df8e596cf1260d5ba9bd03 (diff) | |
| parent | 9ee4a42813b10e541e17bc3b4e50dfd99f9dab14 (diff) | |
| download | CMake-5f96bc9affc47036e95d75c14057c65cc030a4d1.zip CMake-5f96bc9affc47036e95d75c14057c65cc030a4d1.tar.gz CMake-5f96bc9affc47036e95d75c14057c65cc030a4d1.tar.bz2 | |
Merge topic 'cray-compiler-detection'
9ee4a42813 Cray: Fix Cray compiler detection on new platforms
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5561
| -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 2f6bdb4..8ba6abc 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(__CRAYXE) || defined(__CRAYXC) +#if defined(_CRAYC) || defined(__cray__) 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(__CRAYXE) || defined(__CRAYXC) +#if defined(_CRAYC) || defined(__cray__) require += info_cray[argc]; #endif require += info_language_dialect_default[argc]; diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index a743ce7..672fff8 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(__CRAYXE) || defined(__CRAYXC) +#if defined(_CRAYC) || defined(__cray__) char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; #endif @@ -76,7 +76,7 @@ int main(int argc, char* argv[]) #ifdef SIMULATE_VERSION_MAJOR require += info_simulate_version[argc]; #endif -#if defined(__CRAYXE) || defined(__CRAYXC) +#if defined(_CRAYC) || defined(__cray__) require += info_cray[argc]; #endif require += info_language_dialect_default[argc]; diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in index 30f8d4c..7e8828b 100644 --- a/Modules/CMakeFortranCompilerId.F.in +++ b/Modules/CMakeFortranCompilerId.F.in @@ -108,7 +108,7 @@ #else PRINT *, 'INFO:compiler[]' #endif -#if defined(__CRAYXE) || defined(__CRAYXC) +#if defined(_CRAYFTN) PRINT *, 'INFO:compiler_wrapper[CrayPrgEnv]' #endif |