projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 2437808)
meson: use override_options to change warning-level
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Wed, 15 Apr 2020 19:04:30 +0000 (21:04 +0200)
committerMarge Bot <eric+marge@anholt.net>
Thu, 16 Apr 2020 14:48:40 +0000 (14:48 +0000)
This pevents MSVC from complaining about multiple warning-levels on the
command-line.

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

src/gtest/meson.build patch | blob | history

diff --git a/src/gtest/meson.build b/src/gtest/meson.build
index 116fd6b10de06e44f0eeea529cbd1bfdf39dcc1a..bfe0b0091195165b0a8f80a98dc6b6502760172b 100644 (file)
--- 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,
 )