Install generated gdbus header with old glib version too.

pull/3415/merge
Jussi Pakkanen 7 years ago
parent 900c23f98a
commit ccaf5711cd
  1. 6
      mesonbuild/modules/gnome.py
  2. 4
      test cases/frameworks/7 gnome/gdbus/meson.build
  3. 1
      test cases/frameworks/7 gnome/installed_files.txt

@ -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

@ -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')

@ -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

Loading…
Cancel
Save