From efe845a8af9efaa198e1b71879c6050e08a624ef Mon Sep 17 00:00:00 2001 From: Harish Krupo Date: Tue, 16 Apr 2019 10:41:01 +0530 Subject: [PATCH] meson.build: Fix warning for configure_file We claim to support meson versions >= 0.47 but the `install:` argument in configure_file was introduced in version 0.50. This produces the following meson warning: WARNING: Project specifies a minimum meson_version '>= 0.47' but uses features which were added in newer versions: * 0.50.0: {'install arg in configure_file'} From the documentation for the install argument [1]: " When omitted it (install) defaults to true when install_dir is set and not empty, false otherwise." So, remove the `install:` argument and just depend on `install_dir` for installing. Fixes: https://gitlab.freedesktop.org/wayland/weston/issues/225 [1] https://mesonbuild.com/Reference-manual.html#configure_file Signed-off-by: Harish Krupo (cherry picked from commit b81fc517d87eecf2df6ec80c0a317656d611f9b3) --- ivi-shell/meson.build | 1 - man/meson.build | 5 ----- meson.build | 3 ++- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ivi-shell/meson.build b/ivi-shell/meson.build index fceaf8041..bd5f26caf 100644 --- a/ivi-shell/meson.build +++ b/ivi-shell/meson.build @@ -47,7 +47,6 @@ if get_option('shell-ivi') ivi_test_ini = configure_file( input: '../ivi-shell/weston.ini.in', output: 'weston-ivi-test.ini', - install: false, configuration: ivi_test_config ) endif diff --git a/man/meson.build b/man/meson.build index ced569449..80e231203 100644 --- a/man/meson.build +++ b/man/meson.build @@ -11,7 +11,6 @@ man_conf.set('version', version_weston) configure_file( input: 'weston.man', output: 'weston.1', - install: true, install_dir: join_paths(dir_man, 'man1'), configuration: man_conf ) @@ -19,7 +18,6 @@ configure_file( configure_file( input: 'weston-debug.man', output: 'weston-debug.1', - install: true, install_dir: join_paths(dir_man, 'man1'), configuration: man_conf ) @@ -27,7 +25,6 @@ configure_file( configure_file( input: 'weston.ini.man', output: 'weston.ini.5', - install: true, install_dir: join_paths(dir_man, 'man5'), configuration: man_conf ) @@ -36,7 +33,6 @@ if get_option('backend-drm') configure_file( input: 'weston-drm.man', output: 'weston-drm.7', - install: true, install_dir: join_paths(dir_man, 'man7'), configuration: man_conf ) @@ -46,7 +42,6 @@ if get_option('backend-rdp') configure_file( input: 'weston-rdp.man', output: 'weston-rdp.7', - install: true, install_dir: join_paths(dir_man, 'man7'), configuration: man_conf ) diff --git a/meson.build b/meson.build index 2155b7b14..b1f324e7d 100644 --- a/meson.build +++ b/meson.build @@ -166,6 +166,7 @@ subdir('tests') subdir('data') subdir('man') -configure_file(output: 'config.h', install: false, configuration: config_h) +configure_file(output: 'config.h', configuration: config_h) + # TODO: process doc/doxygen/*.doxygen.in