diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-22 14:25:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-22 14:25:50 (GMT) |
| commit | 9e07ea190bcbd83ffb054cff525fc1a0336a1a7d (patch) | |
| tree | 97fcdb5b91cbfebd9ef43c83fc17fb08aac0b2af | |
| parent | 021c61408cc042b1467fbee5cfac4a1ea509118f (diff) | |
| parent | 4c0fb923b7747f1eed0bfa73b8d1653997e1bda9 (diff) | |
| download | CMake-9e07ea190bcbd83ffb054cff525fc1a0336a1a7d.zip CMake-9e07ea190bcbd83ffb054cff525fc1a0336a1a7d.tar.gz CMake-9e07ea190bcbd83ffb054cff525fc1a0336a1a7d.tar.bz2 | |
Merge topic 'compiler-id-arch-only-iar'
4c0fb923b7 IAR: Do not print compiler architecture id for non-IAR compilers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3352
| -rw-r--r-- | Modules/CMakeDetermineASMCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake index fb005ff..a48d33c 100644 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@ -145,7 +145,7 @@ if(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) else() set(_version "") endif() - if(CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID) + if(CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID AND "x${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}" STREQUAL "xIAR") set(_archid " ${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}") else() set(_archid "") diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 7036b93..2321e11 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -143,7 +143,7 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) else() set(_version "") endif() - if(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID) + if(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID AND "x${CMAKE_${lang}_COMPILER_ID}" STREQUAL "xIAR") set(_archid " ${CMAKE_${lang}_COMPILER_ARCHITECTURE_ID}") else() set(_archid "") |