diff options
| author | Brad King <brad.king@kitware.com> | 2009-07-14 19:17:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-07-14 19:17:21 (GMT) |
| commit | 69e366f49bba3ef4eb2019db5e06f265549b6515 (patch) | |
| tree | 24212a22e017ef9c87bf6f4082e190509791ef3b | |
| parent | eff381185a1d95ba365ce7897b733af892c708d6 (diff) | |
| download | CMake-69e366f49bba3ef4eb2019db5e06f265549b6515.zip CMake-69e366f49bba3ef4eb2019db5e06f265549b6515.tar.gz CMake-69e366f49bba3ef4eb2019db5e06f265549b6515.tar.bz2 | |
ENH: Check _SGI_COMPILER_VERSION for compiler id
Some SGI compilers define _SGI_COMPILER_VERSION in addition to the old
_COMPILER_VERSION preprocessor symbol. It is more distinctive, so we
should check it in case the old one is ever removed.
| -rw-r--r-- | Modules/CMakeCCompilerId.c.in | 2 | ||||
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 2 | ||||
| -rw-r--r-- | Modules/CMakeFortranCompilerId.F.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index 35d7df7..7a0a39d 100644 --- a/Modules/CMakeCCompilerId.c.in +++ b/Modules/CMakeCCompilerId.c.in @@ -52,7 +52,7 @@ #elif defined(SDCC) # define COMPILER_ID "SDCC" -#elif defined(_COMPILER_VERSION) +#elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION) # define COMPILER_ID "MIPSpro" /* This compiler is either not known or is too old to define an diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index fa2178c..77a6247 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -43,7 +43,7 @@ SHARC (21000) DSPs */ # define COMPILER_ID "ADSP" -#elif defined(_COMPILER_VERSION) +#elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION) # define COMPILER_ID "MIPSpro" /* This compiler is either not known or is too old to define an diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in index a01dc81..63d3e43 100644 --- a/Modules/CMakeFortranCompilerId.F.in +++ b/Modules/CMakeFortranCompilerId.F.in @@ -12,7 +12,7 @@ PRINT *, 'INFO:compiler[VisualAge]' #elif defined(__PGI) PRINT *, 'INFO:compiler[PGI]' -#elif defined(_COMPILER_VERSION) +#elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION) PRINT *, 'INFO:compiler[MIPSpro]' # if 0 ! This compiler is either not known or is too old to define an |