[libcamera-devel] [PATCH] Documentation: Fixed build when the IPU3 pipeline handler is disabled

[Kieran Bingham]

Quoting Laurent Pinchart (2021-10-28 00:00:05)
> When the IPU3 pipeline handler is disabled, the corresponding IPA module
> isn't compiled, which results in the meson ipu3_ipa_sources variable to
> be undefined. The variable is used unconditionally as part of the
> Doxygen inputs, so Meson complains at configuration time that it is
> undefined.
> 
> Fix it by including the IPU3 IPA documentation in the Doxygen build only
> when the IPU3 pipeline handler is enabled.
> 
> Fixes: 45dd51988952 ("Documentation: Include IPU3 in Doxygen build")
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Oooops. That must have been caused by me.

This looks as good as a fix. Thanks.

Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

> ---
>  Documentation/meson.build | 31 ++++++++++++++++++-------------
>  1 file changed, 18 insertions(+), 13 deletions(-)
> 
> diff --git a/Documentation/meson.build b/Documentation/meson.build
> index df36a808dfb5..4c9726754a92 100644
> --- a/Documentation/meson.build
> +++ b/Documentation/meson.build
> @@ -19,20 +19,25 @@ if doxygen.found() and dot.found()
>                                output : 'Doxyfile',
>                                configuration : cdata)
>  
> +    doxygen_input = [
> +        doxyfile,
> +        libcamera_base_headers,
> +        libcamera_base_sources,
> +        libcamera_internal_headers,
> +        libcamera_ipa_headers,
> +        libcamera_ipa_interfaces,
> +        libcamera_public_headers,
> +        libcamera_sources,
> +        libipa_headers,
> +        libipa_sources,
> +    ]
> +
> +    if is_variable('ipu3_ipa_sources')
> +        doxygen_input += [ipu3_ipa_sources]
> +    endif
> +
>      custom_target('doxygen',
> -                  input : [
> -                      doxyfile,
> -                      ipu3_ipa_sources,
> -                      libcamera_base_headers,
> -                      libcamera_base_sources,
> -                      libcamera_internal_headers,
> -                      libcamera_ipa_headers,
> -                      libcamera_ipa_interfaces,
> -                      libcamera_public_headers,
> -                      libcamera_sources,
> -                      libipa_headers,
> -                      libipa_sources,
> -                  ],
> +                  input : doxygen_input,
>                    output : 'api-html',
>                    command : [doxygen, doxyfile],
>                    install : true,
> base-commit: 76bd9f3d80cb99a3391832b644b65a619427ed00
> -- 
> Regards,
> 
> Laurent Pinchart
>