From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:09:51 +0200 Subject: New upstream version 1.18.0 --- introspection/meson.build | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'introspection') 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( -- cgit 1.3.0-6-gf8a5