diff options
| author | Brad King <brad.king@kitware.com> | 2022-01-31 15:31:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-01-31 15:31:30 (GMT) |
| commit | 74466016ec34ca0598ae3de546b7e71fc983b397 (patch) | |
| tree | 797e6158b25184040c46e52725b874a5cf4aea14 | |
| parent | b1325f591294ac989d985b5b64546e640d765d92 (diff) | |
| parent | cc4da8d13a93e2ad1de22144ac6c7dd3c97e1f03 (diff) | |
| download | CMake-74466016ec34ca0598ae3de546b7e71fc983b397.zip CMake-74466016ec34ca0598ae3de546b7e71fc983b397.tar.gz CMake-74466016ec34ca0598ae3de546b7e71fc983b397.tar.bz2 | |
Merge topic 'iar_cmp0057' into release-3.22
cc4da8d13a IAR/CXX: Fix compatibility with CMP0057 OLD
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6921
| -rw-r--r-- | Modules/Compiler/IAR-CXX.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Modules/Compiler/IAR-CXX.cmake b/Modules/Compiler/IAR-CXX.cmake index a3f1dbc..7df74ad 100644 --- a/Modules/Compiler/IAR-CXX.cmake +++ b/Modules/Compiler/IAR-CXX.cmake @@ -16,14 +16,17 @@ endif() # Whenever needed, override this default behavior using CMAKE_IAR_CXX_FLAG in your toolchain file. if(NOT CMAKE_IAR_CXX_FLAG) - set(_CMAKE_IAR_MODERNCXX_LIST 14 17) - if(${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT} IN_LIST _CMAKE_IAR_MODERNCXX_LIST OR + cmake_policy(PUSH) + cmake_policy(SET CMP0057 NEW) # if IN_LIST + + if(${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT} IN_LIST "14;17" OR ("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM" AND ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT} EQUAL 98)) string(PREPEND CMAKE_CXX_FLAGS "--c++ ") else() string(PREPEND CMAKE_CXX_FLAGS "--eec++ ") endif() - unset(_CMAKE_IAR_MODERNCXX_LIST) + + cmake_policy(POP) endif() set(CMAKE_CXX_STANDARD_COMPILE_OPTION "") |