diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-10-07 09:37:46 -0700 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2021-10-08 08:44:30 -0400 |
| commit | 3f8c78b3172cfc78762cb0bf294c5aaafc18ca44 (patch) | |
| tree | 6634ae93cd34c08db035a98f74450ead3a86cae6 | |
| parent | cfa6ff52e910e8cea88e3c7b74342add2efea900 (diff) | |
| download | meson-3f8c78b3172cfc78762cb0bf294c5aaafc18ca44.zip meson-3f8c78b3172cfc78762cb0bf294c5aaafc18ca44.tar.gz meson-3f8c78b3172cfc78762cb0bf294c5aaafc18ca44.tar.bz2 | |
modules/gnome: Fix unset install_dir
install_dir needs to be set to something, because CustomTarget expects
that. genmarshal still relies on CustomTarget setting it internally
itself.
Fixes #9350
| -rw-r--r-- | mesonbuild/modules/gnome.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 5d8b7b4..714b68a 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1639,7 +1639,7 @@ G_END_DECLS''' raise MesonException(f'Genmarshal does not take a {arg} keyword argument.') install_header = kwargs.pop('install_header', False) - install_dir = kwargs.pop('install_dir', None) + install_dir = kwargs.pop('install_dir', []) custom_kwargs = { 'input': sources, @@ -1664,8 +1664,7 @@ G_END_DECLS''' body = build.CustomTarget(output + '_c', state.subdir, state.subproject, custom_kwargs) custom_kwargs['install'] = install_header - if install_dir is not None: - custom_kwargs['install_dir'] = install_dir + custom_kwargs['install_dir'] = install_dir if new_genmarshal: cmd += ['--pragma-once'] custom_kwargs['command'] = cmd + ['--header', '@INPUT@'] |