diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-21 13:37:58 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-21 09:40:09 -0400 |
| commit | 12cf0a8e4846e2adcafa6c8527911aad7ed15994 (patch) | |
| tree | b92bf96a4176a99a6fb59a1c0d2b9883c138e61d /Modules/CMakeCompilerIdDetection.cmake | |
| parent | c63bd7e06ceb488aeec9447b9faeb4c901b5dff7 (diff) | |
| parent | 8f8d056051824d0d0d4361f2b94f3afec52ecf0b (diff) | |
| download | cmake-12cf0a8e4846e2adcafa6c8527911aad7ed15994.tar.gz | |
Merge topic 'armcc-compiler-id'
8f8d056051 ARMCC: Fix identification of ARM compiler when it defines GNU macros
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3127
Diffstat (limited to 'Modules/CMakeCompilerIdDetection.cmake')
| -rw-r--r-- | Modules/CMakeCompilerIdDetection.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeCompilerIdDetection.cmake b/Modules/CMakeCompilerIdDetection.cmake index 7aac8467c5..ed288f5110 100644 --- a/Modules/CMakeCompilerIdDetection.cmake +++ b/Modules/CMakeCompilerIdDetection.cmake @@ -74,13 +74,13 @@ function(compiler_id_detection outvar lang) endif() list(APPEND ordered_compilers SCO + ARMCC AppleClang Clang GNU MSVC ADSP IAR - ARMCC ) if (lang STREQUAL C) list(APPEND ordered_compilers |