aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorTristan Partin <tristan@partin.io>2023-09-29 13:18:16 -0500
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2023-10-12 05:13:55 +0530
commitc0a5da86494a00b3c242190f720c05b4cfb27740 (patch)
tree088fc5c32792449134a1522f8be1b0515b8afe2b /test cases
parent4c9927e8b700a27ba300b9b6561f6ea223d35585 (diff)
downloadmeson-c0a5da86494a00b3c242190f720c05b4cfb27740.zip
meson-c0a5da86494a00b3c242190f720c05b4cfb27740.tar.gz
meson-c0a5da86494a00b3c242190f720c05b4cfb27740.tar.bz2
Use -idirafter when adding Apple framework include paths
System headers will continue to "preempt" the framework headers. This should allow both <GStreamer/gst/gst.h> and <gst/gst.h>
Diffstat (limited to 'test cases')
-rw-r--r--test cases/osx/5 extra frameworks/meson.build10
-rw-r--r--test cases/osx/5 extra frameworks/stat.c3
2 files changed, 10 insertions, 3 deletions
diff --git a/test cases/osx/5 extra frameworks/meson.build b/test cases/osx/5 extra frameworks/meson.build
index 0bd2c17..f6c01e6 100644
--- a/test cases/osx/5 extra frameworks/meson.build
+++ b/test cases/osx/5 extra frameworks/meson.build
@@ -1,10 +1,14 @@
project('xcode extra framework test', 'c')
-dep_libs = dependency('OpenGL', method : 'extraframework')
-assert(dep_libs.type_name() == 'extraframeworks', 'type_name is ' + dep_libs.type_name())
+opengl_dep = dependency('OpenGL', method : 'extraframework')
+assert(opengl_dep.type_name() == 'extraframeworks', 'type_name is ' + opengl_dep.type_name())
dep_main = dependency('Foundation')
assert(dep_main.type_name() == 'extraframeworks', 'type_name is ' + dep_main.type_name())
-stlib = static_library('stat', 'stat.c', install : true, dependencies: dep_libs)
+# https://github.com/mesonbuild/meson/issues/10002
+ldap_dep = dependency('ldap', method : 'extraframework')
+assert(ldap_dep.type_name() == 'extraframeworks', 'type_name is ' + ldap_dep.type_name())
+
+stlib = static_library('stat', 'stat.c', install : true, dependencies: [opengl_dep, ldap_dep])
exe = executable('prog', 'prog.c', install : true, dependencies: dep_main)
diff --git a/test cases/osx/5 extra frameworks/stat.c b/test cases/osx/5 extra frameworks/stat.c
index 4825cef..79a3974 100644
--- a/test cases/osx/5 extra frameworks/stat.c
+++ b/test cases/osx/5 extra frameworks/stat.c
@@ -1 +1,4 @@
+// https://github.com/mesonbuild/meson/issues/10002
+#include <ldap.h>
+
int func(void) { return 933; }