diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-14 12:24:26 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-14 12:24:31 (GMT) |
| commit | 0f096b8d733bb43f1fa95c052e5c2d9e8b381508 (patch) | |
| tree | 879743c26d1131f5a2036dfdc90bdd9f5157f0e7 /Modules | |
| parent | 688b1c11ec6a9eb071594c77a4c92023660be20e (diff) | |
| parent | 336c4fc6fa80149e189a19f91b8de934b48105de (diff) | |
| download | CMake-0f096b8d733bb43f1fa95c052e5c2d9e8b381508.zip CMake-0f096b8d733bb43f1fa95c052e5c2d9e8b381508.tar.gz CMake-0f096b8d733bb43f1fa95c052e5c2d9e8b381508.tar.bz2 | |
Merge topic 'cmp0054-asm-warning'
336c4fc6 CMakeDetermineASMCompiler: fix a CMP0054 warning
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1057
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineASMCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake index d031421..f7cf54a 100644 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@ -103,7 +103,7 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) include(CMakeDetermineCompilerId) set(userflags) CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT} "${userflags}") - if("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}" STREQUAL "IAR") + if("x${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}" STREQUAL "xIAR") # primary necessary to detect architecture, so the right archiver and linker can be picked # eg. IAR Assembler V8.10.1.12857/W32 for ARM # Cut out identification first, newline handling is a pain |