[libcamera-devel,v2] meson: Utilise default compiler options
diff mbox series

Message ID 20190114223248.8643-1-kieran.bingham@ideasonboard.com
State Accepted
Commit a5e86d4396ae7221e431a748559e56a8d024e43e
Headers show
Series
  • [libcamera-devel,v2] meson: Utilise default compiler options
Related show

Commit Message

Kieran Bingham Jan. 14, 2019, 10:32 p.m. UTC 
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>

---
v2:
 - Remove duplicated -Wall, -Wextra flags which are provided at
   warning_level=2

 meson.build | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Niklas Söderlund Jan. 15, 2019, 9:15 p.m. UTC | #1 
Hi Kieran,

Thanks for your work.

On 2019-01-14 22:32:48 +0000, Kieran Bingham wrote:
> 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>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> 
> ---
> v2:
>  - Remove duplicated -Wall, -Wextra flags which are provided at
>    warning_level=2
> 
>  meson.build | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 0ab0da981083..4465a3851a30 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.
> @@ -9,15 +14,11 @@ project('libcamera', 'c', 'cpp',
>  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
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
Kieran Bingham Jan. 15, 2019, 9:36 p.m. UTC | #2 
Hi Niklas,

On 15/01/2019 21:15, Niklas Söderlund wrote:
> Hi Kieran,
> 
> Thanks for your work.
> 
> On 2019-01-14 22:32:48 +0000, Kieran Bingham wrote:
>> 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>
> 
> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> 

Thank you - I'm sorry - I pushed before I saw your tag.

--
Kieran

>>
>> ---
>> v2:
>>  - Remove duplicated -Wall, -Wextra flags which are provided at
>>    warning_level=2
>>
>>  meson.build | 9 +++++----
>>  1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/meson.build b/meson.build
>> index 0ab0da981083..4465a3851a30 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.
>> @@ -9,15 +14,11 @@ project('libcamera', 'c', 'cpp',
>>  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
>>
>> _______________________________________________
>> libcamera-devel mailing list
>> libcamera-devel@lists.libcamera.org
>> https://lists.libcamera.org/listinfo/libcamera-devel
>
Niklas Söderlund Jan. 15, 2019, 9:45 p.m. UTC | #3 
Hi Kieran,

On 2019-01-15 21:36:50 +0000, Kieran Bingham wrote:
> Hi Niklas,
> 
> On 15/01/2019 21:15, Niklas Söderlund wrote:
> > Hi Kieran,
> > 
> > Thanks for your work.
> > 
> > On 2019-01-14 22:32:48 +0000, Kieran Bingham wrote:
> >> 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>
> > 
> > Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> > 
> 
> Thank you - I'm sorry - I pushed before I saw your tag.

No worries, less things I can be blamed for not having noticed :-)

> 
> --
> Kieran
> 
> >>
> >> ---
> >> v2:
> >>  - Remove duplicated -Wall, -Wextra flags which are provided at
> >>    warning_level=2
> >>
> >>  meson.build | 9 +++++----
> >>  1 file changed, 5 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/meson.build b/meson.build
> >> index 0ab0da981083..4465a3851a30 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.
> >> @@ -9,15 +14,11 @@ project('libcamera', 'c', 'cpp',
> >>  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
> >>
> >> _______________________________________________
> >> libcamera-devel mailing list
> >> libcamera-devel@lists.libcamera.org
> >> https://lists.libcamera.org/listinfo/libcamera-devel
> > 
> 
> -- 
> Regards
> --
> Kieran

Patch
diff mbox series 

diff --git a/meson.build b/meson.build
index 0ab0da981083..4465a3851a30 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.
@@ -9,15 +14,11 @@  project('libcamera', 'c', 'cpp',
 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')