diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-04 15:43:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-04 15:44:02 (GMT) |
| commit | cf70b871438f1ae8a40a4d3822376f75151af258 (patch) | |
| tree | cd4e01341d739f83f9b30f0d116fe7cd1b9b185e | |
| parent | 5c1ead795d3fc003908a515565842cf1815eb111 (diff) | |
| parent | f28e7fc1a51d5dfa81e2844c51eb811835e99583 (diff) | |
| download | CMake-cf70b871438f1ae8a40a4d3822376f75151af258.zip CMake-cf70b871438f1ae8a40a4d3822376f75151af258.tar.gz CMake-cf70b871438f1ae8a40a4d3822376f75151af258.tar.bz2 | |
Merge topic 'armcc-compiler-id'
f28e7fc1a5 ARMCC: Do not identify ARMClang as ARMCC
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3187
| -rw-r--r-- | Modules/Compiler/ARMCC-DetermineCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Compiler/ARMCC-DetermineCompiler.cmake b/Modules/Compiler/ARMCC-DetermineCompiler.cmake index a3667d7..5f2d0f8 100644 --- a/Modules/Compiler/ARMCC-DetermineCompiler.cmake +++ b/Modules/Compiler/ARMCC-DetermineCompiler.cmake @@ -1,5 +1,5 @@ # ARMCC Toolchain -set(_compiler_id_pp_test "defined(__ARMCC_VERSION)") +set(_compiler_id_pp_test "defined(__ARMCC_VERSION) && !defined(__clang__)") set(_compiler_id_version_compute " #if __ARMCC_VERSION >= 1000000 |