diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-12 13:02:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-12 13:02:55 (GMT) |
| commit | 57199deafaca949e0588556ebf78bb9437e31365 (patch) | |
| tree | d899142a89e28409cc04a52304af0dd918b44447 /Modules/Compiler | |
| parent | 1f5b2a8de93dc828d0cdc650478999133273c2c7 (diff) | |
| parent | e4707048c01b28858237a21e614da56a696e9771 (diff) | |
| download | CMake-57199deafaca949e0588556ebf78bb9437e31365.zip CMake-57199deafaca949e0588556ebf78bb9437e31365.tar.gz CMake-57199deafaca949e0588556ebf78bb9437e31365.tar.bz2 | |
Merge topic 'fix-iar-binutils-for-cxx'
e4707048 IAR: FindBinUtils should work for CXX as well as C
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1572
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/IAR-FindBinUtils.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/IAR-FindBinUtils.cmake b/Modules/Compiler/IAR-FindBinUtils.cmake index b29ee81..5fecb26 100644 --- a/Modules/Compiler/IAR-FindBinUtils.cmake +++ b/Modules/Compiler/IAR-FindBinUtils.cmake @@ -10,7 +10,7 @@ get_filename_component(__iar_hint_2 "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPI set(__iar_hints "${__iar_hint_1}" "${__iar_hint_2}") -if("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") +if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") # could allow using normal binutils ar, since objects are normal ELF files? find_program(CMAKE_IAR_LINKARM ilinkarm.exe HINTS ${__iar_hints} DOC "The IAR ARM linker") @@ -38,7 +38,7 @@ set(CMAKE_IAR_LINKARM \"${CMAKE_IAR_LINKARM}\") ") -elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR") +elseif("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR") # For AVR and AVR32, IAR uses the "xlink" linker and the "xar" archiver: find_program(CMAKE_IAR_LINKER xlink.exe HINTS ${__iar_hints} |