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 <harish.krupo.kps@intel.com>
dev
Harish Krupo 6 years ago
parent 923a1e9688
commit b81fc517d8
  1. 1
      ivi-shell/meson.build
  2. 5
      man/meson.build
  3. 3
      meson.build

@ -45,7 +45,6 @@ if get_option('shell-ivi')
ivi_test_ini = configure_file( ivi_test_ini = configure_file(
input: '../ivi-shell/weston.ini.in', input: '../ivi-shell/weston.ini.in',
output: 'weston-ivi-test.ini', output: 'weston-ivi-test.ini',
install: false,
configuration: ivi_test_config configuration: ivi_test_config
) )
endif endif

@ -11,7 +11,6 @@ man_conf.set('version', version_weston)
configure_file( configure_file(
input: 'weston.man', input: 'weston.man',
output: 'weston.1', output: 'weston.1',
install: true,
install_dir: join_paths(dir_man, 'man1'), install_dir: join_paths(dir_man, 'man1'),
configuration: man_conf configuration: man_conf
) )
@ -19,7 +18,6 @@ configure_file(
configure_file( configure_file(
input: 'weston-debug.man', input: 'weston-debug.man',
output: 'weston-debug.1', output: 'weston-debug.1',
install: true,
install_dir: join_paths(dir_man, 'man1'), install_dir: join_paths(dir_man, 'man1'),
configuration: man_conf configuration: man_conf
) )
@ -27,7 +25,6 @@ configure_file(
configure_file( configure_file(
input: 'weston.ini.man', input: 'weston.ini.man',
output: 'weston.ini.5', output: 'weston.ini.5',
install: true,
install_dir: join_paths(dir_man, 'man5'), install_dir: join_paths(dir_man, 'man5'),
configuration: man_conf configuration: man_conf
) )
@ -36,7 +33,6 @@ if get_option('backend-drm')
configure_file( configure_file(
input: 'weston-drm.man', input: 'weston-drm.man',
output: 'weston-drm.7', output: 'weston-drm.7',
install: true,
install_dir: join_paths(dir_man, 'man7'), install_dir: join_paths(dir_man, 'man7'),
configuration: man_conf configuration: man_conf
) )
@ -46,7 +42,6 @@ if get_option('backend-rdp')
configure_file( configure_file(
input: 'weston-rdp.man', input: 'weston-rdp.man',
output: 'weston-rdp.7', output: 'weston-rdp.7',
install: true,
install_dir: join_paths(dir_man, 'man7'), install_dir: join_paths(dir_man, 'man7'),
configuration: man_conf configuration: man_conf
) )

@ -166,6 +166,7 @@ subdir('tests')
subdir('data') subdir('data')
subdir('man') 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 # TODO: process doc/doxygen/*.doxygen.in

Loading…
Cancel
Save