aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-06-21 02:12:17 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-06-21 02:12:17 +0530
commit0623f71e3629fa4e736086cf7b61aeddf623ed0c (patch)
tree181da647b1fe86048fe2082a0863450d50f99874
parent50fef8921804d3189efb26b26e4e1b4afa3012ec (diff)
downloadmeson-0623f71e3629fa4e736086cf7b61aeddf623ed0c.zip
meson-0623f71e3629fa4e736086cf7b61aeddf623ed0c.tar.gz
meson-0623f71e3629fa4e736086cf7b61aeddf623ed0c.tar.bz2
Add a linuxlike test case for subdir include order
Needs glib-2.0 as a pkg-config dependency
-rw-r--r--test cases/linuxlike/6 subdir include order/meson.build12
-rw-r--r--test cases/linuxlike/6 subdir include order/prog.c7
-rw-r--r--test cases/linuxlike/6 subdir include order/subdir/glib.h1
3 files changed, 20 insertions, 0 deletions
diff --git a/test cases/linuxlike/6 subdir include order/meson.build b/test cases/linuxlike/6 subdir include order/meson.build
new file mode 100644
index 0000000..fea3984
--- /dev/null
+++ b/test cases/linuxlike/6 subdir include order/meson.build
@@ -0,0 +1,12 @@
+project('subdir include order', 'c')
+
+# Ensure that headers in subdirs override external dependencies
+cc = meson.get_compiler('c')
+
+glib = dependency('glib-2.0')
+
+# This will fail to compile if it picks up the system-installed glib instead of
+# the glib in the subdir
+executable('prog', 'prog.c',
+ include_directories : include_directories('subdir'),
+ dependencies : glib)
diff --git a/test cases/linuxlike/6 subdir include order/prog.c b/test cases/linuxlike/6 subdir include order/prog.c
new file mode 100644
index 0000000..9c8af35
--- /dev/null
+++ b/test cases/linuxlike/6 subdir include order/prog.c
@@ -0,0 +1,7 @@
+#include <glib.h>
+
+#ifndef MESON_OUR_GLIB
+#error "Failed"
+#endif
+
+int main() { return 0; }
diff --git a/test cases/linuxlike/6 subdir include order/subdir/glib.h b/test cases/linuxlike/6 subdir include order/subdir/glib.h
new file mode 100644
index 0000000..444b2d0
--- /dev/null
+++ b/test cases/linuxlike/6 subdir include order/subdir/glib.h
@@ -0,0 +1 @@
+#define MESON_OUR_GLIB 1