[libcamera-devel] [PATCH] meson: Utilise default compiler options

Kieran Bingham kieran.bingham at ideasonboard.com
Mon Jan 14 11:03:46 CET 2019


Remove our custom declarations for cpp_std=c++11 and -Werror, instead
prefering to use the built-in default_option parameters from meson.

Our custom compiler flags (such as -Wno-unused-parameter) are
maintained.

Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
---
 meson.build | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 0ab0da981083..37640c39f5b8 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,11 @@
 project('libcamera', 'c', 'cpp',
   meson_version: '>= 0.40',
   version : '0.1',
+  default_options: [
+    'werror=true',
+    'warning_level=2',
+    'cpp_std=c++11',
+  ],
   license : 'LGPL 2.1+')
 
 # TODO: Extract this from project.version.
@@ -11,13 +16,11 @@ api_version = '0.1'
 common_arguments = [
     '-Wall',
     '-Wextra',
-    '-Werror',
     '-Wno-unused-parameter',
 ]
 
 c_arguments = common_arguments
 cpp_arguments = common_arguments
-cpp_arguments += '-std=c++11'
 
 add_project_arguments(c_arguments, language: 'c')
 add_project_arguments(cpp_arguments, language: 'cpp')
-- 
2.17.1



More information about the libcamera-devel mailing list