Update compiler options to support IAR

swift-nav · Jun 1, 2024 · 6c77c68 · 6c77c68
1 parent 68306be
commit 6c77c68
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/CompileOptions.cmake b/CompileOptions.cmake
@@ -227,15 +227,31 @@ function(swift_set_compile_options)
   foreach(target ${targets})
     if(cxx_enabled)
       if(x_EXCEPTIONS)
-        target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fexceptions>)
+        if(${CMAKE_CXX_COMPILER_ID} STREQUAL "IAR")
+          #target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:--exceptions>)
+        else()
+          target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fexceptions>)
+        endif()
       else()
-        target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>)
+        if(${CMAKE_CXX_COMPILER_ID} STREQUAL "IAR")
+          target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:--no_exceptions>)
+        else()
+          target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>)
+        endif()
       endif()
 
       if(x_RTTI)
-        target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-frtti>)
+        if(${CMAKE_CXX_COMPILER_ID} STREQUAL "IAR")
+          #target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:--rtti>)
+        else()
+          target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-frtti>)
+        endif()
       else()
-        target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
+        if(${CMAKE_CXX_COMPILER_ID} STREQUAL "IAR")
+          target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:--no_rtti>)
+        else()
+          target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
+        endif()
       endif()
     endif()
 

diff --git a/LanguageStandards.cmake b/LanguageStandards.cmake
@@ -60,7 +60,20 @@ function(swift_set_language_standards)
     set(C_EXTENSIONS OFF)
   endif()
 
-  set_target_properties(${x_UNPARSED_ARGUMENTS}
+  if(${CMAKE_C_COMPILER_ID} STREQUAL "IAR")
+    set_target_properties(${x_UNPARSED_ARGUMENTS}
+      PROPERTIES
+      C_STANDARD_REQUIRED ON
+      C_EXTENSIONS ${C_EXTENSIONS}
+      CXX_STANDARD_REQUIRED ON
+      CXX_EXTENSIONS OFF
+    )
+    target_compile_options(${x_UNPARSED_ARGUMENTS} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:--strict>)
+    if(NOT ${C_EXTENSIONS})
+      target_compile_options(${x_UNPARSED_ARGUMENTS} PRIVATE $<$<COMPILE_LANGUAGE:C>:--strict>)
+    endif()
+  else()
+    set_target_properties(${x_UNPARSED_ARGUMENTS}
       PROPERTIES
           C_STANDARD ${x_C}
           C_STANDARD_REQUIRED ON
@@ -69,4 +82,5 @@ function(swift_set_language_standards)
           CXX_STANDARD_REQUIRED ON
           CXX_EXTENSIONS OFF
   )
+  endif()
 endfunction()