aboutsummaryrefslogtreecommitdiff
path: root/test cases/frameworks
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-03-26 02:26:27 +0100
committerEli Schwartz <eschwartz93@gmail.com>2022-03-29 12:52:55 -0400
commitb7686dfed5bea27956d7508107449ae997478a01 (patch)
tree50681d681ae00b3acd86d4712b6a5363219af3e0 /test cases/frameworks
parent39623a36ca0dc757ea36960e0589a06ca798e5c1 (diff)
downloadmeson-b7686dfed5bea27956d7508107449ae997478a01.zip
meson-b7686dfed5bea27956d7508107449ae997478a01.tar.gz
meson-b7686dfed5bea27956d7508107449ae997478a01.tar.bz2
gnome: Fix gtkdoc when using multiple Apple frameworks
The `-framework Foundation -framework CoreFoundation` ended up de-duplicated by OrderedSet into `-framework Foundation CoreFoundation`.
Diffstat (limited to 'test cases/frameworks')
-rw-r--r--test cases/frameworks/10 gtk-doc/meson.build6
-rw-r--r--test cases/frameworks/10 gtk-doc/test.json2
2 files changed, 7 insertions, 1 deletions
diff --git a/test cases/frameworks/10 gtk-doc/meson.build b/test cases/frameworks/10 gtk-doc/meson.build
index 339e93f..b49efc0 100644
--- a/test cases/frameworks/10 gtk-doc/meson.build
+++ b/test cases/frameworks/10 gtk-doc/meson.build
@@ -31,9 +31,15 @@ libfoo = shared_library('foo', 'foo.c',
dependencies: gobject,
)
+deps = []
+if host_machine.system() == 'darwin'
+ deps += dependency('appleframeworks', modules : ['Foundation', 'CoreFoundation'])
+endif
+
foo_dep = declare_dependency(
link_with: libfoo,
include_directories: inc,
+ dependencies: deps,
)
subdir('doc')
diff --git a/test cases/frameworks/10 gtk-doc/test.json b/test cases/frameworks/10 gtk-doc/test.json
index f2805d3..1085b55 100644
--- a/test cases/frameworks/10 gtk-doc/test.json
+++ b/test cases/frameworks/10 gtk-doc/test.json
@@ -60,5 +60,5 @@
{"type": "file", "file": "usr/share/gtk-doc/html/foobar3/up.png"},
{"type": "file", "file": "usr/share/gtk-doc/html/foobar3/up-insensitive.png"}
],
- "skip_on_jobname": ["azure", "macos", "msys2"]
+ "skip_on_jobname": ["azure", "msys2"]
}