[libcamera-devel] Documentation: Drop install directive for Doxyfile

Message ID 20190428115700.21551-1-niklas.soderlund@ragnatech.se
State Accepted
Commit 5caa8a971d3dc6bc1287c8c9dd932f6b64412cbc
Headers show
Series
  • [libcamera-devel] Documentation: Drop install directive for Doxyfile
Related show

Commit Message

Niklas Söderlund April 28, 2019, 11:57 a.m. UTC
Building the documentation reports warnings,

WARNING: Project targetting '>= 0.40' but tried to use feature introduced in '0.50.0': install arg in configure_file
WARNING: Project specifies a minimum meson_version '>= 0.40' but uses features which were added in newer versions:
 * 0.50.0: {'install arg in configure_file'}

Due to the usage of the directive configure_file { install: false } in
Documentation/meason.build which is introduced in meson 0.50. As we do
not wish to install the Doxyfile no install_dir is set so there is no
need to explicitly state that it should not be installed. Silence the
warning by dropping the install directive.

Fixes: 53c4d4c34fc49b95 ("Documentation: Generate source code documentation using Doxygen")
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 Documentation/meson.build | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Laurent Pinchart April 28, 2019, noon UTC | #1
Hi Niklas,

Thank you for the patch.

On Sun, Apr 28, 2019 at 01:57:00PM +0200, Niklas Söderlund wrote:
> Building the documentation reports warnings,
> 
> WARNING: Project targetting '>= 0.40' but tried to use feature introduced in '0.50.0': install arg in configure_file
> WARNING: Project specifies a minimum meson_version '>= 0.40' but uses features which were added in newer versions:
>  * 0.50.0: {'install arg in configure_file'}
> 
> Due to the usage of the directive configure_file { install: false } in
> Documentation/meason.build which is introduced in meson 0.50. As we do
> not wish to install the Doxyfile no install_dir is set so there is no
> need to explicitly state that it should not be installed. Silence the
> warning by dropping the install directive.
> 
> Fixes: 53c4d4c34fc49b95 ("Documentation: Generate source code documentation using Doxygen")
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

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

> ---
>  Documentation/meson.build | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/Documentation/meson.build b/Documentation/meson.build
> index 73da25b848cc0bf3..12a99307c741537e 100644
> --- a/Documentation/meson.build
> +++ b/Documentation/meson.build
> @@ -14,8 +14,7 @@ if doxygen.found()
>  
>      doxyfile = configure_file(input: 'Doxyfile.in',
>                                output: 'Doxyfile',
> -                              configuration: cdata,
> -                              install: false)
> +                              configuration: cdata)
>  
>      custom_target('doxygen',
>                    input: [
Niklas Söderlund April 28, 2019, 12:41 p.m. UTC | #2
Pushed to master.

On 2019-04-28 13:57:00 +0200, Niklas Söderlund wrote:
> Building the documentation reports warnings,
> 
> WARNING: Project targetting '>= 0.40' but tried to use feature introduced in '0.50.0': install arg in configure_file
> WARNING: Project specifies a minimum meson_version '>= 0.40' but uses features which were added in newer versions:
>  * 0.50.0: {'install arg in configure_file'}
> 
> Due to the usage of the directive configure_file { install: false } in
> Documentation/meason.build which is introduced in meson 0.50. As we do
> not wish to install the Doxyfile no install_dir is set so there is no
> need to explicitly state that it should not be installed. Silence the
> warning by dropping the install directive.
> 
> Fixes: 53c4d4c34fc49b95 ("Documentation: Generate source code documentation using Doxygen")
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> ---
>  Documentation/meson.build | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/Documentation/meson.build b/Documentation/meson.build
> index 73da25b848cc0bf3..12a99307c741537e 100644
> --- a/Documentation/meson.build
> +++ b/Documentation/meson.build
> @@ -14,8 +14,7 @@ if doxygen.found()
>  
>      doxyfile = configure_file(input: 'Doxyfile.in',
>                                output: 'Doxyfile',
> -                              configuration: cdata,
> -                              install: false)
> +                              configuration: cdata)
>  
>      custom_target('doxygen',
>                    input: [
> -- 
> 2.21.0
>

Patch

diff --git a/Documentation/meson.build b/Documentation/meson.build
index 73da25b848cc0bf3..12a99307c741537e 100644
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@ -14,8 +14,7 @@  if doxygen.found()
 
     doxyfile = configure_file(input: 'Doxyfile.in',
                               output: 'Doxyfile',
-                              configuration: cdata,
-                              install: false)
+                              configuration: cdata)
 
     custom_target('doxygen',
                   input: [