Mesa (master): meson: use override_options to change warning-level

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Apr 16 15:09:18 UTC 2020


Module: Mesa
Branch: master
Commit: e9ad8af6f377a3afb5cbfb8d1844887af6894ea7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9ad8af6f377a3afb5cbfb8d1844887af6894ea7

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Apr 15 21:04:30 2020 +0200

meson: use override_options to change warning-level

This pevents MSVC from complaining about multiple warning-levels on the
command-line.

Reviewed-by: Brian Paul <brianp at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4577>

---

 src/gtest/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gtest/meson.build b/src/gtest/meson.build
index 116fd6b10de..bfe0b009119 100644
--- a/src/gtest/meson.build
+++ b/src/gtest/meson.build
@@ -22,7 +22,7 @@ libgtest = static_library(
   'gtest',
   files('src/gtest-all.cc', 'src/gtest_main.cc'),
   include_directories : include_directories('include'),
-  cpp_args : '-w',
+  override_options: 'warning_level=1',
   build_by_default : false,
 )
 



More information about the mesa-commit mailing list