diff options
author | Brad King <brad.king@kitware.com> | 2017-08-04 13:15:10 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-04 13:15:14 (GMT) |
commit | 86a107cb5cfee1314bbb8caccfec894f12f6328a (patch) | |
tree | eda5bc8a5a3eb430ffb0378e6a1ad7d18af0f311 /Modules | |
parent | c5c8ee1a9b7fd6af3b246f63ff27311358eea45a (diff) | |
parent | 168b42d2475abed82ded69940cf5fdca585226e8 (diff) | |
download | CMake-86a107cb5cfee1314bbb8caccfec894f12f6328a.zip CMake-86a107cb5cfee1314bbb8caccfec894f12f6328a.tar.gz CMake-86a107cb5cfee1314bbb8caccfec894f12f6328a.tar.bz2 |
Merge topic 'set_IAR_excetion_option'
168b42d2 IAR: Enable extensions by default
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1081
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/Compiler/IAR-C.cmake | 3 | ||||
-rw-r--r-- | Modules/Compiler/IAR-CXX.cmake | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Modules/Compiler/IAR-C.cmake b/Modules/Compiler/IAR-C.cmake index 48a9a16..55e019e 100644 --- a/Modules/Compiler/IAR-C.cmake +++ b/Modules/Compiler/IAR-C.cmake @@ -5,6 +5,9 @@ include(Compiler/CMakeCommonCompilerMacros) # The toolchains for ARM and AVR are quite different: if("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") + + set(CMAKE_C_EXTENSION_COMPILE_OPTION -e) + set(CMAKE_C90_STANDARD_COMPILE_OPTION "") set(CMAKE_C90_EXTENSION_COMPILE_OPTION -e) diff --git a/Modules/Compiler/IAR-CXX.cmake b/Modules/Compiler/IAR-CXX.cmake index 7a6ba2b..8d86100 100644 --- a/Modules/Compiler/IAR-CXX.cmake +++ b/Modules/Compiler/IAR-CXX.cmake @@ -17,6 +17,8 @@ if("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") endif() endif() + set(CMAKE_CXX_EXTENSION_COMPILE_OPTION -e) + set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "") set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION -e) |