diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-04 15:40:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-04-04 15:40:12 (GMT) |
| commit | d2473769e77f9cf9802c71effadb5e1469fcd625 (patch) | |
| tree | f0d2b72bd527c6b0d783f1a7fed17cb5d7ecc91d | |
| parent | 3c9dec0bdc11a69afcbaa93a0e61dc71cddd5491 (diff) | |
| parent | f28e7fc1a51d5dfa81e2844c51eb811835e99583 (diff) | |
| download | CMake-d2473769e77f9cf9802c71effadb5e1469fcd625.zip CMake-d2473769e77f9cf9802c71effadb5e1469fcd625.tar.gz CMake-d2473769e77f9cf9802c71effadb5e1469fcd625.tar.bz2 | |
Merge branch 'armcc-compiler-id' into release-3.14
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 |