From 13e801ecb061d97013a409981e8326ec438d1545 Mon Sep 17 00:00:00 2001 From: Krzysztof Swiecicki Date: Fri, 26 Jul 2024 09:13:55 +0000 Subject: [PATCH 1/2] Add default switch warning suppression --- cmake/helpers.cmake | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake index bb9b703d8..8899077ef 100644 --- a/cmake/helpers.cmake +++ b/cmake/helpers.cmake @@ -176,7 +176,27 @@ function(get_program_version_major_minor name ret) PARENT_SCOPE) endfunction() +# Checks compiler for given ${flag}, stores the output in C_HAS_${flag} and +# CXX_HAS_${flag} (if compiler supports C++) +function(check_compilers_flag flag) + check_c_compiler_flag("${flag}" "C_HAS_${flag}") + if(CMAKE_CXX_COMPILE_FEATURES) + check_cxx_compiler_flag("${flag}" "CXX_HAS_${flag}") + endif() +endfunction() + +function(check_add_target_compile_options target) + foreach(option ${ARGN}) + check_compilers_flag(${option}) + if(C_HAS_${option} AND CXX_HAS_${option}) + target_compile_options(${target} PRIVATE ${option}) + endif() + endforeach() +endfunction() + function(add_umf_target_compile_options name) + check_add_target_compile_options(${name} "-Wno-covered-switch-default") + if(NOT MSVC) target_compile_options( ${name} From ebf618f57e25badd0cd609f2eb140d9dee443386 Mon Sep 17 00:00:00 2001 From: Krzysztof Swiecicki Date: Fri, 26 Jul 2024 09:14:33 +0000 Subject: [PATCH 2/2] Remove werror compile option from UMF targets --- cmake/helpers.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake index 8899077ef..29cd774b6 100644 --- a/cmake/helpers.cmake +++ b/cmake/helpers.cmake @@ -203,7 +203,6 @@ function(add_umf_target_compile_options name) PRIVATE -fPIC -Wall -Wextra - -Werror -Wpedantic -Wempty-body -Wunused-parameter