Message ID | 20190322104350.31091-2-kieran.bingham@ideasonboard.com |
---|---|
State | Superseded |
Headers | show |
Series |
|
Related | show |
Hi Kieran, Thank you for the patch. On Fri, Mar 22, 2019 at 10:43:47AM +0000, Kieran Bingham wrote: > Re-order the optional components to make them alphabetical, and fix up > the indentation to use two spaces as required by meson. A comment is > added to highlight that these optional components are enabled by > default. > > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > meson.build | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/meson.build b/meson.build > index 43d4a57602bb..e001cd267c78 100644 > --- a/meson.build > +++ b/meson.build > @@ -29,12 +29,15 @@ subdir('include') > subdir('src') > subdir('utils') > > -if get_option('tests') > - subdir('test') > -endif > +# The documentation and test components are optional and can be desabled s/desabled/disabled/ > +# through configuration values. They are enabled by default. > > if get_option('documentation') > - subdir('Documentation') > + subdir('Documentation') > +endif > + > +if get_option('tests') > + subdir('test') > endif I would have not have separated the optional components, but I'll let you decide. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > pkg_mod = import('pkgconfig')
Hi Laurent, On 22/03/2019 22:59, Laurent Pinchart wrote: > Hi Kieran, > > Thank you for the patch. > > On Fri, Mar 22, 2019 at 10:43:47AM +0000, Kieran Bingham wrote: >> Re-order the optional components to make them alphabetical, and fix up >> the indentation to use two spaces as required by meson. A comment is >> added to highlight that these optional components are enabled by >> default. >> >> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> >> --- >> meson.build | 11 +++++++---- >> 1 file changed, 7 insertions(+), 4 deletions(-) >> >> diff --git a/meson.build b/meson.build >> index 43d4a57602bb..e001cd267c78 100644 >> --- a/meson.build >> +++ b/meson.build >> @@ -29,12 +29,15 @@ subdir('include') >> subdir('src') >> subdir('utils') >> >> -if get_option('tests') >> - subdir('test') >> -endif >> +# The documentation and test components are optional and can be desabled > > s/desabled/disabled/ Ugh - How did I type that... > >> +# through configuration values. They are enabled by default. >> >> if get_option('documentation') >> - subdir('Documentation') >> + subdir('Documentation') >> +endif >> + >> +if get_option('tests') >> + subdir('test') >> endif > > I would have not have separated the optional components, but I'll let > you decide. That produces either A): # The documentation and test components are optional and can be disabled # through configuration values. They are enabled by default. if get_option('documentation') subdir('Documentation') endif subdir('include') subdir('src') if get_option('tests') subdir('test') endif subdir('utils') or B) (with a bit more spacing) # The documentation and test components are optional and can be disabled # through configuration values. They are enabled by default. if get_option('documentation') subdir('Documentation') endif subdir('include') subdir('src') if get_option('tests') subdir('test') endif subdir('utils') Both of which look really weird to me. If you prefer either A) or B) let me know and I'll update the patch for that. > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > >> >> pkg_mod = import('pkgconfig') >
diff --git a/meson.build b/meson.build index 43d4a57602bb..e001cd267c78 100644 --- a/meson.build +++ b/meson.build @@ -29,12 +29,15 @@ subdir('include') subdir('src') subdir('utils') -if get_option('tests') - subdir('test') -endif +# The documentation and test components are optional and can be desabled +# through configuration values. They are enabled by default. if get_option('documentation') - subdir('Documentation') + subdir('Documentation') +endif + +if get_option('tests') + subdir('test') endif pkg_mod = import('pkgconfig')
Re-order the optional components to make them alphabetical, and fix up the indentation to use two spaces as required by meson. A comment is added to highlight that these optional components are enabled by default. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> --- meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)