From 2e0485bb9bc4f36783436b8a2e1689659ecaf52c Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 4 May 2018 17:44:01 +0530 Subject: gnome: Disable usage of new --body and --header args The new --body and --header args are broken because they do not allow the use of --output-directory to set the correct `#include "foo.h"` line in `foo.c`. The changes in the gdbus test case show this. Disabled till this can be fixed in glib. Closes https://github.com/mesonbuild/meson/issues/3488 --- test cases/frameworks/7 gnome/gdbus/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/7 gnome/gdbus/meson.build b/test cases/frameworks/7 gnome/gdbus/meson.build index 46259318b..5bd640ffa 100644 --- a/test cases/frameworks/7 gnome/gdbus/meson.build +++ b/test cases/frameworks/7 gnome/gdbus/meson.build @@ -20,9 +20,15 @@ gdbus_src = gnome.gdbus_codegen('generated-gdbus', ) assert(gdbus_src.length() == 3, 'expected 3 targets') +if not pretend_glib_old and glib.version().version_compare('>=2.51.3') + includes = [] +else + includes = include_directories('..') +endif + gdbus_exe = executable('gdbus-test', 'gdbusprog.c', gdbus_src, - include_directories : include_directories('..'), + include_directories : includes, dependencies : giounix) test('gdbus', gdbus_exe) -- cgit v1.3