diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-12 13:37:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-12 13:37:58 (GMT) |
| commit | 1c1a1e08e82626aaf53ec0285ff4eabdb75d6d71 (patch) | |
| tree | 3a7a85b038009b74a288484b201a4b1dac3d1d6d /Modules | |
| parent | 920ac301b5516273036fdabb334bcd38dff20a20 (diff) | |
| parent | 8fdf08c097edadd134dc36cc80b4b557cddbfea8 (diff) | |
| download | CMake-1c1a1e08e82626aaf53ec0285ff4eabdb75d6d71.zip CMake-1c1a1e08e82626aaf53ec0285ff4eabdb75d6d71.tar.gz CMake-1c1a1e08e82626aaf53ec0285ff4eabdb75d6d71.tar.bz2 | |
Merge topic 'IAR_6_50_6_fix'
8fdf08c097 IAR: Fix compiler id, version, and arch detection on 6.50.6
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2371
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index dc4d9be..5e2df26a 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -525,6 +525,9 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file) ${CMAKE_${lang}_COMPILER_ID_STRINGS_PARAMETERS} REGEX "INFO:[A-Za-z0-9_]+\\[[^]]*\\]") set(COMPILER_ID_TWICE) + # With the IAR Compiler, some strings are found twice, first time as incomplete + # list like "?<Constant "INFO:compiler[IAR]">". Remove the incomplete copies. + list(FILTER CMAKE_${lang}_COMPILER_ID_STRINGS EXCLUDE REGEX "\\?<Constant \\\"") # In C# binaries, some strings are found more than once. list(REMOVE_DUPLICATES CMAKE_${lang}_COMPILER_ID_STRINGS) foreach(info ${CMAKE_${lang}_COMPILER_ID_STRINGS}) |