b81fc517d8
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>
51 lines
1.5 KiB
Meson
51 lines
1.5 KiB
Meson
if get_option('shell-ivi')
|
|
srcs_shell_ivi = [
|
|
'ivi-shell.c',
|
|
'ivi-layout.c',
|
|
'ivi-layout-transition.c',
|
|
ivi_application_server_protocol_h,
|
|
ivi_application_protocol_c,
|
|
input_method_unstable_v1_server_protocol_h,
|
|
input_method_unstable_v1_protocol_c,
|
|
]
|
|
plugin_shell_ivi = shared_library(
|
|
'ivi-shell',
|
|
srcs_shell_ivi,
|
|
include_directories: include_directories('..', '../shared'),
|
|
dependencies: [ dep_lib_desktop, dep_libweston ],
|
|
name_prefix: '',
|
|
install: true,
|
|
install_dir: dir_module_weston
|
|
)
|
|
env_modmap += 'ivi-shell.so=@0@;'.format(plugin_shell_ivi.full_path())
|
|
|
|
install_headers('ivi-layout-export.h', subdir: 'weston')
|
|
|
|
srcs_ivi_hmi = [
|
|
'hmi-controller.c',
|
|
ivi_hmi_controller_server_protocol_h,
|
|
ivi_hmi_controller_protocol_c,
|
|
]
|
|
plugin_ivi_hmi = shared_library(
|
|
'hmi-controller',
|
|
srcs_ivi_hmi,
|
|
include_directories: include_directories('..', '../shared'),
|
|
dependencies: [ dep_libweston, dep_libshared ],
|
|
name_prefix: '',
|
|
install: true,
|
|
install_dir: dir_module_weston
|
|
)
|
|
env_modmap += 'hmi-controller.so=@0@;'.format(plugin_ivi_hmi.full_path())
|
|
|
|
ivi_test_config = configuration_data()
|
|
ivi_test_config.set('bindir', dir_bin)
|
|
ivi_test_config.set('libexecdir', dir_libexec)
|
|
ivi_test_config.set('plugin_prefix', meson.current_build_dir())
|
|
ivi_test_config.set('westondatadir', join_paths(dir_data, 'weston'))
|
|
ivi_test_ini = configure_file(
|
|
input: '../ivi-shell/weston.ini.in',
|
|
output: 'weston-ivi-test.ini',
|
|
configuration: ivi_test_config
|
|
)
|
|
endif
|