diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-02 17:36:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-02 17:36:47 (GMT) |
| commit | 4daf4c3aa950642592e546d18a65e3015841b48e (patch) | |
| tree | 96446421940d7b41fdaa957952e14bbf65d2d7d2 | |
| parent | b45f9b364382839995c76bc9794bb5ae8fb787b5 (diff) | |
| parent | 73e84a392bc2edc53a4e7b4cc8356a4a0c2b5c8f (diff) | |
| download | CMake-4daf4c3aa950642592e546d18a65e3015841b48e.zip CMake-4daf4c3aa950642592e546d18a65e3015841b48e.tar.gz CMake-4daf4c3aa950642592e546d18a65e3015841b48e.tar.bz2 | |
Merge topic 'IAR-CXX-fix' into release-3.25
73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7857
| -rw-r--r-- | Modules/Compiler/IAR-CXX.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/IAR-CXX.cmake b/Modules/Compiler/IAR-CXX.cmake index 6c15735..3f0ef1f 100644 --- a/Modules/Compiler/IAR-CXX.cmake +++ b/Modules/Compiler/IAR-CXX.cmake @@ -22,9 +22,9 @@ 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_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM" AND ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT} EQUAL 98)) - string(PREPEND CMAKE_CXX_FLAGS "--c++ ") + set(CMAKE_IAR_CXX_FLAG --c++) else() - string(PREPEND CMAKE_CXX_FLAGS "--eec++ ") + set(CMAKE_IAR_CXX_FLAG --eec++) endif() unset(_CMAKE_IAR_MODERNCXX_LIST) |