diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-23 15:01:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-23 15:01:48 (GMT) |
| commit | ffb4804c8886b8537cbe05566a2a5ae151a4a71e (patch) | |
| tree | c4efefc7110840b5878740d541bdac0f49eed012 | |
| parent | 1242ea14c508ff2733c4ed2e40c3dc85c12f238b (diff) | |
| parent | 57f22c6a3d37fff5ef0e1020b745417c3b573607 (diff) | |
| download | CMake-ffb4804c8886b8537cbe05566a2a5ae151a4a71e.zip CMake-ffb4804c8886b8537cbe05566a2a5ae151a4a71e.tar.gz CMake-ffb4804c8886b8537cbe05566a2a5ae151a4a71e.tar.bz2 | |
Merge topic 'iar-fix-support-avr-8101'
57f22c6a3d IAR:Fix version detection for xlinkavr
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8501
| -rw-r--r-- | Modules/CMakeFindBinUtils.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index 604d25c..461839a 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -135,7 +135,7 @@ elseif("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" MATCHES "^xIAR$") elseif("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ARCHITECTURE_ID}" IN_LIST _CMAKE_IAR_XTOOLS) __append_IAR_tool(AR "xar") if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR" AND - (CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION VERSION_GREATER 7)) + (CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION VERSION_GREATER_EQUAL 8)) # IAR UBROF Linker V8.10+ for Microchip AVR is `xlinkavr` __append_IAR_tool(LINKER "xlink${_CMAKE_IAR_LOWER_ARCHITECTURE_ID}") else() |