Browse Source

Merge topic 'IAR-CXX-fix'

73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7857
Brad King 3 years ago
parent
commit
db6123d66e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Modules/Compiler/IAR-CXX.cmake

+ 2 - 2
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)