diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2022-02-14 11:13:06 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2022-02-14 11:13:06 +0100 |
| commit | 2a96b129fbc1b65f34597a72e29cb9cc7cb208d9 (patch) | |
| tree | 180f7057e0b9eb6ace503481a17cab6dd8c0eba3 /tools | |
| parent | 9a90d530e8ff90a22f266452579a89645c6c5937 (diff) | |
| download | glibmm-2a96b129fbc1b65f34597a72e29cb9cc7cb208d9.tar.gz | |
meson.build: Specify 'check' option in run_command()
The default value will be changed in future Meson releases.
Don't use deprecated python3.path() and execute(..., gui_app: ...).
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/extra_defs_gen/meson.build | 1 | ||||
| -rw-r--r-- | tools/meson.build | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/extra_defs_gen/meson.build b/tools/extra_defs_gen/meson.build index 92849a39..6fecead8 100644 --- a/tools/extra_defs_gen/meson.build +++ b/tools/extra_defs_gen/meson.build @@ -27,6 +27,7 @@ if meson.is_subproject() meson.current_source_dir(), project_build_root / 'glib' / 'glibmm_generate_extra_defs', 'generate_extra_defs.h', + check: true, ) endif diff --git a/tools/meson.build b/tools/meson.build index 370c8f3f..6ebab821 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -10,13 +10,13 @@ install_procdir = install_libdir / glibmm_pcname / 'proc' # Configuration data for gmmproc. gmmproc_conf_data = configuration_data() -gmmproc_conf_data.set('PERL', perl.found() ? perl.path() : '') +gmmproc_conf_data.set('PERL', perl.found() ? perl.full_path() : '') gmmproc_conf_data.set('configure_input', 'tools/gmmproc. Generated from gmmproc.in') gmmproc_conf_data.set('prefix', install_prefix) gmmproc_conf_data.set('exec_prefix', '${prefix}') gmmproc_conf_data.set('libdir', '${exec_prefix}' / install_libdir) gmmproc_conf_data.set('GLIBMM_MODULE_NAME', glibmm_pcname) -gmmproc_conf_data.set('M4', m4.found() ? '/'.join(m4.path().split('\\')) : '') +gmmproc_conf_data.set('M4', m4.found() ? '/'.join(m4.full_path().split('\\')) : '') gmmproc_conf_data.set('PACKAGE_VERSION', meson.project_version()) gmmproc = configure_file( @@ -28,7 +28,7 @@ gmmproc = configure_file( # Configuration data for generate_wrap_init.pl. gen_wrap_init_conf_data = configuration_data() -gen_wrap_init_conf_data.set('PERL', perl.found() ? perl.path() : '') +gen_wrap_init_conf_data.set('PERL', perl.found() ? perl.full_path() : '') gen_wrap_init_conf_data.set('configure_input', 'tools/generate_wrap_init.pl. Generated from generate_wrap_init.pl.in') |