[libcamera-devel] [PATCH v2 09/11] Documentation: Move all dependencies into features

[Laurent Pinchart]

Hi Ricardo,

Thank you for the patch.

On Thu, Sep 24, 2020 at 09:19:20AM +0200, Ricardo Ribalda wrote:
> This way if the user enables the documentation and the dependencies are
> missing the configure fails.
> 
> Suggested-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Signed-off-by: Ricardo Ribalda <ricardo at ribalda.com>

Nice :-)

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> ---
>  Documentation/meson.build | 6 +++---
>  meson.build               | 4 +---
>  meson_options.txt         | 2 +-
>  3 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/Documentation/meson.build b/Documentation/meson.build
> index 7b497ae..d3d64f7 100644
> --- a/Documentation/meson.build
> +++ b/Documentation/meson.build
> @@ -7,8 +7,8 @@ doc_install_dir = join_paths(get_option('datadir'), 'doc',
>  # Doxygen
>  #
>  
> -doxygen = find_program('doxygen', required : false)
> -dot = find_program('dot', required : false)
> +doxygen = find_program('doxygen', required : get_option('documentation'))
> +dot = find_program('dot', required : get_option('documentation'))
>  
>  if doxygen.found() and dot.found()
>      cdata = configuration_data()
> @@ -42,7 +42,7 @@ endif
>  
>  sphinx = find_program('sphinx-build-3', required : false)
>  if not sphinx.found()
> -    sphinx = find_program('sphinx-build', required : false)
> +    sphinx = find_program('sphinx-build', required : get_option('documentation'))
>  endif
>  
>  if sphinx.found()
> diff --git a/meson.build b/meson.build
> index c58d458..992281c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -108,9 +108,7 @@ subdir('utils')
>  # 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('Documentation')
>  
>  if get_option('test')
>      subdir('test')
> diff --git a/meson_options.txt b/meson_options.txt
> index d2e07ef..7f7b3e5 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -6,7 +6,7 @@ option('android',
>          description : 'Compile libcamera with Android Camera3 HAL interface')
>  
>  option('documentation',
> -        type : 'boolean',
> +        type : 'feature',
>          description : 'Generate the project documentation')
>  
>  option('gstreamer',

-- 
Regards,

Laurent Pinchart