diff options
| author | Islam Amer <pharon@gmail.com> | 2017-12-07 22:46:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-12 13:00:16 (GMT) |
| commit | e4707048c01b28858237a21e614da56a696e9771 (patch) | |
| tree | 0e96051fcfb76ed14ff83939812a8fee53bab1fd /Modules/Compiler/IAR-FindBinUtils.cmake | |
| parent | 7746fdb2fe0177341aadeafec2ae73aa08ddfaf6 (diff) | |
| download | CMake-e4707048c01b28858237a21e614da56a696e9771.zip CMake-e4707048c01b28858237a21e614da56a696e9771.tar.gz CMake-e4707048c01b28858237a21e614da56a696e9771.tar.bz2 | |
IAR: FindBinUtils should work for CXX as well as C
The IAR compiler test works when a project specifies LANGUAGES C CXX
but fails if CXX comes before C. This change makes it work regardless
of the order.
Diffstat (limited to 'Modules/Compiler/IAR-FindBinUtils.cmake')
| -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 2b04795..d662f56 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} |