aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-05-04 17:44:01 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2018-05-04 23:00:23 +0300
commit2e0485bb9bc4f36783436b8a2e1689659ecaf52c (patch)
treefc182c8ff977c7d25ae49fa9b473c8810a0a0399 /test cases
parentf1c92d7c9cafd13877f34746d2cb7d1f79d853dd (diff)
downloadmeson-2e0485bb9bc4f36783436b8a2e1689659ecaf52c.zip
meson-2e0485bb9bc4f36783436b8a2e1689659ecaf52c.tar.gz
meson-2e0485bb9bc4f36783436b8a2e1689659ecaf52c.tar.bz2
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
Diffstat (limited to 'test cases')
-rw-r--r--test cases/frameworks/7 gnome/gdbus/meson.build8
1 files changed, 7 insertions, 1 deletions
diff --git a/test cases/frameworks/7 gnome/gdbus/meson.build b/test cases/frameworks/7 gnome/gdbus/meson.build
index 4625931..5bd640f 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)