meson: stop using deprecated functions, require meson >= 0.58

* get_pkgconfig_variable() -> get_variable()
* prog.path() -> prog.full_path()
* meson.build_root() -> meson.global_build_root()
This commit is contained in:
Daniel Eklöf 2022-02-27 11:26:40 +01:00
parent a65804139d
commit 9b343fd9fb
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 8 additions and 7 deletions

View file

@ -1,7 +1,7 @@
project('foot', 'c',
version: '1.11.0',
license: 'MIT',
meson_version: '>=0.54.0',
meson_version: '>=0.58.0',
default_options: [
'c_std=c11',
'warning_level=1',
@ -48,7 +48,7 @@ endif
# Compute the relative path used by compiler invocations.
source_root = meson.current_source_dir().split('/')
build_root = meson.build_root().split('/')
build_root = meson.global_build_root().split('/')
relative_dir_parts = []
i = 0
in_prefix = true
@ -92,11 +92,11 @@ endif
tllist = dependency('tllist', version: '>=1.0.4', fallback: 'tllist')
fcft = dependency('fcft', version: ['>=3.0.1', '<4.0.0'], fallback: 'fcft')
wayland_protocols_datadir = wayland_protocols.get_pkgconfig_variable('pkgdatadir')
wayland_protocols_datadir = wayland_protocols.get_variable('pkgdatadir')
wscanner = dependency('wayland-scanner', native: true)
wscanner_prog = find_program(
wscanner.get_pkgconfig_variable('wayland_scanner'), native: true)
wscanner.get_variable('wayland_scanner'), native: true)
wl_proto_headers = []
wl_proto_src = []
@ -251,7 +251,7 @@ if systemd.found()
configuration = configuration_data()
configuration.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
systemd_units_dir = systemd.get_pkgconfig_variable('systemduserunitdir')
systemd_units_dir = systemd.get_variable('systemduserunitdir')
configure_file(
configuration: configuration,
input: 'foot-server@.service.in',