meson: Utilise default compiler options

Remove our custom declarations for cpp_std=c++11, -Wall, -Wextra 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.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Kieran Bingham 2019-01-07 14:22:30 +00:00
parent f1caaaf387
commit a5e86d4396

View file

@ -1,6 +1,11 @@
project('libcamera', 'c', 'cpp', project('libcamera', 'c', 'cpp',
meson_version: '>= 0.40', meson_version: '>= 0.40',
version : '0.1', version : '0.1',
default_options: [
'werror=true',
'warning_level=2',
'cpp_std=c++11',
],
license : 'LGPL 2.1+') license : 'LGPL 2.1+')
# TODO: Extract this from project.version. # TODO: Extract this from project.version.
@ -9,15 +14,11 @@ project('libcamera', 'c', 'cpp',
api_version = '0.1' api_version = '0.1'
common_arguments = [ common_arguments = [
'-Wall',
'-Wextra',
'-Werror',
'-Wno-unused-parameter', '-Wno-unused-parameter',
] ]
c_arguments = common_arguments c_arguments = common_arguments
cpp_arguments = common_arguments cpp_arguments = common_arguments
cpp_arguments += '-std=c++11'
add_project_arguments(c_arguments, language: 'c') add_project_arguments(c_arguments, language: 'c')
add_project_arguments(cpp_arguments, language: 'cpp') add_project_arguments(cpp_arguments, language: 'cpp')