diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-23 14:30:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-23 14:31:25 (GMT) |
| commit | 2452067fb2522937b867af4d6f3e8a843079877a (patch) | |
| tree | 53acb21c4d30338f2b67f917952c708b9b744e3c /Modules/Compiler | |
| parent | 54188c0e8cc508b8362d74c2c752bfff5d579d59 (diff) | |
| parent | 8954f9354359c6a8a272e73961d0606c948dcc9e (diff) | |
| download | CMake-2452067fb2522937b867af4d6f3e8a843079877a.zip CMake-2452067fb2522937b867af4d6f3e8a843079877a.tar.gz CMake-2452067fb2522937b867af4d6f3e8a843079877a.tar.bz2 | |
Merge topic 'iar-rl78-xlink'
8954f93543 IAR: emit fatal message for RL78 XLINK
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6552
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/IAR-C.cmake | 8 | ||||
| -rw-r--r-- | Modules/Compiler/IAR-CXX.cmake | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Modules/Compiler/IAR-C.cmake b/Modules/Compiler/IAR-C.cmake index 054ee74..7b2e556 100644 --- a/Modules/Compiler/IAR-C.cmake +++ b/Modules/Compiler/IAR-C.cmake @@ -28,7 +28,7 @@ endif() # Architecture specific if("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") if(CMAKE_C_COMPILER_VERSION_INTERNAL VERSION_LESS 7) - # IAR ARM 4.X uses xlink.exe, detection is not yet implemented + # IAR ARM 4.X uses xlink.exe, detection is not implemented message(FATAL_ERROR "CMAKE_C_COMPILER_VERSION = ${CMAKE_C_COMPILER_VERSION} not supported by CMake.") endif() __compiler_iar_ilink(C) @@ -43,8 +43,12 @@ elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "RH850") __compiler_check_default_language_standard(C 1.10 90 1.10 99 2.10 11) elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "RL78") + if(CMAKE_C_COMPILER_VERSION VERSION_LESS 2) + # IAR RL78 1.X uses xlink.exe, detection is not implemented + message(FATAL_ERROR "CMAKE_C_COMPILER_VERSION = ${CMAKE_C_COMPILER_VERSION} not supported by CMake.") + endif() __compiler_iar_ilink(C) - __compiler_check_default_language_standard(C 1.10 90 1.10 99 4.10 11) + __compiler_check_default_language_standard(C 2.10 90 1.10 99 4.10 11) elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "RISCV") __compiler_iar_ilink(C) diff --git a/Modules/Compiler/IAR-CXX.cmake b/Modules/Compiler/IAR-CXX.cmake index d93b272..4909cc5 100644 --- a/Modules/Compiler/IAR-CXX.cmake +++ b/Modules/Compiler/IAR-CXX.cmake @@ -37,7 +37,7 @@ endif() # Architecture specific if("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") if(CMAKE_CXX_COMPILER_VERSION_INTERNAL VERSION_LESS 7) - # IAR ARM 4.X uses xlink.exe, detection is not yet implemented + # IAR ARM 4.X uses xlink.exe, detection is not implemented message(FATAL_ERROR "CMAKE_CXX_COMPILER_VERSION = ${CMAKE_C_COMPILER_VERSION} not supported by CMake.") endif() __compiler_iar_ilink(CXX) @@ -52,8 +52,12 @@ elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "RH850") __compiler_check_default_language_standard(CXX 1.10 98 2.10 14) elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "RL78") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2) + # IAR RL78 1.X uses xlink.exe, detection is not implemented + message(FATAL_ERROR "CMAKE_CXX_COMPILER_VERSION = ${CMAKE_C_COMPILER_VERSION} not supported by CMake.") + endif() __compiler_iar_ilink(CXX) - __compiler_check_default_language_standard(CXX 1.10 98 4.10 14) + __compiler_check_default_language_standard(CXX 2.10 98 4.10 14) elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "RISCV") __compiler_iar_ilink(CXX) |