From 92623d24473d929f7bf77d16e4583da07573a942 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Thu, 14 Aug 2025 13:18:40 +0200 Subject: [PATCH] imgui: Silence build warnings for imgui Avoid treating any warnings as errors in the third-party imgui code, and use Wno-error=stringop-overflow for code in Mesa. Suggested-by: @eric Signed-off-by: Valentine Burley Part-of: --- src/imgui/meson.build | 2 +- src/intel/tools/meson.build | 4 ++-- src/vulkan/overlay-layer/meson.build | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/imgui/meson.build b/src/imgui/meson.build index e90306a6725..f95095810a1 100644 --- a/src/imgui/meson.build +++ b/src/imgui/meson.build @@ -1,7 +1,7 @@ libimgui_core = static_library( 'imgui_core', files('imgui.cpp', 'imgui_draw.cpp', 'imgui_widgets.cpp'), - cpp_args : ['-w'], + cpp_args : cpp.get_supported_arguments('-w', '-Wno-error'), install : false ) diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build index d486af7dfd1..beea51f6660 100644 --- a/src/intel/tools/meson.build +++ b/src/intel/tools/meson.build @@ -200,7 +200,7 @@ if with_tools.contains('intel-ui') include_directories : [inc_include, inc_src, inc_intel], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', - cpp_args : ['-fpermissive', '-Wno-parentheses'], + cpp_args : cpp.get_supported_arguments('-fpermissive', '-Wno-parentheses', '-Wno-error=stringop-overflow'), install : true ) @@ -221,7 +221,7 @@ if with_tools.contains('intel-ui') include_directories : [inc_include, inc_src, inc_intel], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', - cpp_args : ['-fpermissive', '-Wno-parentheses'], + cpp_args : cpp.get_supported_arguments('-fpermissive', '-Wno-parentheses', '-Wno-error=stringop-overflow'), install : true ) endif diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build index 5294037ea5f..1f612afe2e8 100644 --- a/src/vulkan/overlay-layer/meson.build +++ b/src/vulkan/overlay-layer/meson.build @@ -28,7 +28,7 @@ vklayer_files = files( vklayer_mesa_overlay = shared_library( 'VkLayer_MESA_overlay', vklayer_files, overlay_spv, sha1_h, - c_args : [no_override_init_args], + c_args : no_override_init_args + cc.get_supported_arguments('-Wno-error=stringop-overflow'), gnu_symbol_visibility : 'hidden', dependencies : [idep_vulkan_util, idep_mesautil, vulkan_wsi_deps, libimgui_core_dep, dep_dl], include_directories : [inc_include, inc_src],