diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-09 17:08:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-09 17:09:02 (GMT) |
| commit | 5b29664e5890c398914979086d2547f0e9d41d60 (patch) | |
| tree | f908a268e9bff3936384092b0435e4eac1bb93fd | |
| parent | 9acecc3eb90b3a900c83324c6d5ced81d594e3d0 (diff) | |
| parent | bd3e23a605fa940aa91c9bc71b89d9d283af5515 (diff) | |
| download | CMake-5b29664e5890c398914979086d2547f0e9d41d60.zip CMake-5b29664e5890c398914979086d2547f0e9d41d60.tar.gz CMake-5b29664e5890c398914979086d2547f0e9d41d60.tar.bz2 | |
Merge topic 'iar-cmp0057' into release-3.23
bd3e23a605 IAR: Fix detection of modern C++ version
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7053
| -rw-r--r-- | Modules/Compiler/IAR-CXX.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/Compiler/IAR-CXX.cmake b/Modules/Compiler/IAR-CXX.cmake index 7df74ad..6c15735 100644 --- a/Modules/Compiler/IAR-CXX.cmake +++ b/Modules/Compiler/IAR-CXX.cmake @@ -19,12 +19,14 @@ if(NOT CMAKE_IAR_CXX_FLAG) cmake_policy(PUSH) cmake_policy(SET CMP0057 NEW) # if IN_LIST - if(${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT} IN_LIST "14;17" OR + set(_CMAKE_IAR_MODERNCXX_LIST 14 17) + if(${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT} IN_LIST _CMAKE_IAR_MODERNCXX_LIST 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() |