diff options
| author | Michael Biebl <biebl@debian.org> | 2019-04-21 21:10:42 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-04-21 21:10:42 +0200 |
| commit | 1761e93f84aba1f3a2f0ebc3d753303f27395fed (patch) | |
| tree | 2a0aa70159a57641294d4aee7aee061bc25c0a7b /introspection | |
| parent | 6cbf8459e4602877369dbf20c6597708725758c6 (diff) | |
| parent | 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c (diff) | |
Update upstream source from tag 'upstream/1.18.0'
Update to upstream version '1.18.0' with Debian dir c79ce54aa2bd35bd9bd13eb01cf8687eaae2c0c1
Diffstat (limited to 'introspection')
| -rw-r--r-- | introspection/meson.build | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/introspection/meson.build b/introspection/meson.build index e442ac85..631432a7 100644 --- a/introspection/meson.build +++ b/introspection/meson.build @@ -73,13 +73,20 @@ foreach iface: ifaces sources += res - content_files += join_paths(meson.current_build_dir(), 'dbus-' + iface_xml) + if gio_unix_dep.version().version_compare('>= 2.51.3') + dbus_iface_xml_path = join_paths(meson.current_build_dir(), 'dbus-' + iface_xml) + else + dbus_iface_xml_path = join_paths(meson.build_root(), 'dbus-' + iface_xml) + endif + + content_files += dbus_iface_xml_path # res is an array only since 0.46. Documentation won't work with # older versions if meson.version().version_compare('>= 0.46.0') - introspection_files += res[2] + introspection_files += [ [res[2], dbus_iface_xml_path] ] endif + endforeach install_data( |