diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-20 15:22:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-20 15:22:02 (GMT) |
| commit | 8cc16c942013fd640eda76c3cae4be0a82eea277 (patch) | |
| tree | d6c33682a2a1955bfa776a8fc40d0e73339c9f86 /Modules | |
| parent | 9603e418e52899f865cada55572f623134bc2d99 (diff) | |
| parent | 8f8d056051824d0d0d4361f2b94f3afec52ecf0b (diff) | |
| download | CMake-8cc16c942013fd640eda76c3cae4be0a82eea277.zip CMake-8cc16c942013fd640eda76c3cae4be0a82eea277.tar.gz CMake-8cc16c942013fd640eda76c3cae4be0a82eea277.tar.bz2 | |
Merge branch 'armcc-compiler-id' into release-3.14
Merge-request: !3127
Diffstat (limited to 'Modules')
| -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 4d0c681..6a22d27 100644 --- a/Modules/CMakeCompilerIdDetection.cmake +++ b/Modules/CMakeCompilerIdDetection.cmake @@ -73,13 +73,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 |