diff --git a/gtk/meson.build b/gtk/meson.build index a75a4f2354..21540dd93b 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -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 diff --git a/meson.build b/meson.build index 4ee93ee044..a997efae53 100644 --- a/meson.build +++ b/meson.build @@ -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 diff --git a/testsuite/meson.build b/testsuite/meson.build index 032baf2979..42f059095c 100644 --- a/testsuite/meson.build +++ b/testsuite/meson.build @@ -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')