diff options
| author | Justin LaPolla <jlapolla@cray.com> | 2020-12-01 10:42:06 -0600 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-12-01 12:20:47 -0500 |
| commit | 9ee4a42813b10e541e17bc3b4e50dfd99f9dab14 (patch) | |
| tree | 9532f43c1be602cbb0a46d8e41c1b834190c6656 | |
| parent | f264f1d783d57c70a0864768b6b1aa44fc94194a (diff) | |
| download | cmake-9ee4a42813b10e541e17bc3b4e50dfd99f9dab14.tar.gz | |
Cray: Fix Cray compiler detection on new platforms
Customer reported problems detecting the Cray compiler on their Apollo80
system. We were checking for the __CRAYXC and __CRAYXE predefined
macros. These macros reflect the platform that the compiler is running
on, i.e. Cray XC and Cray XE machines. Naturally, this didn't work on
Apollo80.
This commit uses the official Cray compiler identification macros which
are defined on every platform:
CCE Version C Macro C++ Macro Fortran Macro
============ ======== ========= =============
version < 9 _CRAYC _CRAYC _CRAYFTN
version >= 9 __cray__ __cray__ _CRAYFTN
| -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 2f6bdb4a78..8ba6abc7da 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 a743ce7816..672fff86d3 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 30f8d4c45f..7e8828b770 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 |