diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-27 23:07:30 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-28 00:19:29 +0300 |
| commit | ccaf5711cd50c2119d03cda77d378e1a87eca0c9 (patch) | |
| tree | 31644610e0fdcb42257519570b505fa88518bda6 | |
| parent | 900c23f98ad83a3c831c2246c2343ec30f48687f (diff) | |
| download | meson-ccaf5711cd50c2119d03cda77d378e1a87eca0c9.tar.gz | |
Install generated gdbus header with old glib version too.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 6 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/gdbus/meson.build | 4 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/installed_files.txt | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index abefe0579..be090e25a 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -959,11 +959,15 @@ This will become a hard error in the future.''') self._print_gdbus_warning() cmd += ['--generate-c-code', '@OUTDIR@/' + namebase, '@INPUT@'] outputs = [namebase + '.c', namebase + '.h'] + install = kwargs.get('install_header', False) custom_kwargs = {'input': xml_files, 'output': outputs, 'command': cmd, - 'build_by_default': build_by_default + 'build_by_default': build_by_default, + 'install': install, } + if install and 'install_dir' in kwargs: + custom_kwargs['install_dir'] = [False, kwargs['install_dir']] ct = build.CustomTarget(target_name, state.subdir, state.subproject, custom_kwargs) # Ensure that the same number (and order) of arguments are returned # regardless of the gdbus-codegen (glib) version being used diff --git a/test cases/frameworks/7 gnome/gdbus/meson.build b/test cases/frameworks/7 gnome/gdbus/meson.build index 68ad706fd..46259318b 100644 --- a/test cases/frameworks/7 gnome/gdbus/meson.build +++ b/test cases/frameworks/7 gnome/gdbus/meson.build @@ -14,7 +14,9 @@ gdbus_src = gnome.gdbus_codegen('generated-gdbus', annotations : [ ['com.example.Hello()', 'org.freedesktop.DBus.Deprecated', 'true'] ], - docbook : 'generated-gdbus-doc' + docbook : 'generated-gdbus-doc', + install_header : true, + install_dir : get_option('includedir') ) assert(gdbus_src.length() == 3, 'expected 3 targets') diff --git a/test cases/frameworks/7 gnome/installed_files.txt b/test cases/frameworks/7 gnome/installed_files.txt index ac132efb7..7502888dc 100644 --- a/test cases/frameworks/7 gnome/installed_files.txt +++ b/test cases/frameworks/7 gnome/installed_files.txt @@ -15,3 +15,4 @@ usr/share/gir-1.0/MesonDep2-1.0.gir usr/share/glib-2.0/schemas/com.github.meson.gschema.xml usr/share/simple-resources.gresource usr/include/simple-resources.h +usr/include/generated-gdbus.h |