build: Drop Meson version checks

We depend on a new enough version of Meson.
This commit is contained in:
Emmanuele Bassi 2022-12-06 21:15:48 +00:00
parent 4b16634e0e
commit b310ee1eac
3 changed files with 12 additions and 26 deletions

View File

@ -1147,8 +1147,6 @@ gtk_launch = executable(
)
gtk_tools += gtk_launch
if meson.version().version_compare('>=0.54.0')
foreach tool: gtk_tools
meson.override_find_program(tool.name(), tool)
endforeach
endif
foreach tool: gtk_tools
meson.override_find_program(tool.name(), tool)
endforeach

View File

@ -1011,21 +1011,11 @@ subdir('docs/reference')
install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
if not meson.is_cross_build()
if meson.version().version_compare('>=0.57.0')
gnome.post_install(
glib_compile_schemas: true,
gio_querymodules: gio_module_dirs,
gtk_update_icon_cache: get_option('demos'),
)
else
# Keep this in sync with post-install.py expected arguments
meson.add_install_script('build-aux/meson/post-install.py',
gtk_api_version,
gtk_binary_version,
join_paths(gtk_prefix, get_option('bindir')),
gtk_libdir,
gtk_datadir)
endif
gnome.post_install(
glib_compile_schemas: true,
gio_querymodules: gio_module_dirs,
gtk_update_icon_cache: get_option('demos'),
)
else
message('Not executing post-install steps automatically when cross compiling')
endif

View File

@ -2,12 +2,10 @@ gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir'))
installed_test_bindir = join_paths(gtk_libexecdir, 'installed-tests', 'gtk+')
installed_test_datadir = join_paths(gtk_datadir, 'installed-tests', 'gtk+')
if meson.version().version_compare('>=0.57.0')
add_test_setup('default',
is_default: true,
exclude_suites: ['flaky', 'failing'],
)
endif
add_test_setup('default',
is_default: true,
exclude_suites: ['flaky', 'failing'],
)
subdir('gtk')
subdir('gdk')