diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-05 13:33:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-11-05 13:33:54 (GMT) |
| commit | fccf19f49b4a9f6ec71c226af1a99c97359b9a2e (patch) | |
| tree | 781610a89b261ce6ed6dd0138e4d6a20f73679c7 /Modules/CMakeCXXCompilerId.cpp.in | |
| parent | a7742140ad1a88e354037ea391c0e773f147ebd2 (diff) | |
| download | CMake-fccf19f49b4a9f6ec71c226af1a99c97359b9a2e.zip CMake-fccf19f49b4a9f6ec71c226af1a99c97359b9a2e.tar.gz CMake-fccf19f49b4a9f6ec71c226af1a99c97359b9a2e.tar.bz2 | |
Fix PathScale compiler id for Clang-based upstream
Upstream PathScale now uses Clang as its front-end. Test for __PATHCC__
before __clang__.
Reported-by: C. Bergström <cbergstrom@pathscale.com>
Diffstat (limited to 'Modules/CMakeCXXCompilerId.cpp.in')
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index 2c8dd4b..5e70a41 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -25,6 +25,14 @@ # define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE) # endif +#elif defined(__PATHCC__) +# define COMPILER_ID "PathScale" +# define COMPILER_VERSION_MAJOR DEC(__PATHCC__) +# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__) +# if defined(__PATHCC_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__) +# endif + #elif defined(__clang__) # define COMPILER_ID "Clang" # define COMPILER_VERSION_MAJOR DEC(__clang_major__) @@ -100,14 +108,6 @@ # define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__) # endif -#elif defined(__PATHCC__) -# define COMPILER_ID "PathScale" -# define COMPILER_VERSION_MAJOR DEC(__PATHCC__) -# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__) -# if defined(__PATHCC_PATCHLEVEL__) -# define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__) -# endif - #elif defined(_CRAYC) # define COMPILER_ID "Cray" # define COMPILER_VERSION_MAJOR DEC(_RELEASE) |