From bed55a902c46ad0fb1330a19daaa9834a37d3336 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 28 Nov 2021 00:09:29 -0500 Subject: gnome module: document and fix install_dir x3, by allowing false *_gir and *_typelib generate_gir forces building both the typelib and gir, and some people only want one or the other (probably only the typelib?) which means flagging the other as install_dir: false in the same way custom_target supports. As this always worked, albeit undocumented, make sure it keeps working. It's pretty reasonable to allow, anyway. Fixes https://github.com/mesonbuild/meson/pull/9484#issuecomment-980131791 --- test cases/frameworks/12 multiple gir/gir/meson.build | 3 ++- test cases/frameworks/12 multiple gir/test.json | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/12 multiple gir/gir/meson.build b/test cases/frameworks/12 multiple gir/gir/meson.build index 6001a09..5a52c9c 100644 --- a/test cases/frameworks/12 multiple gir/gir/meson.build +++ b/test cases/frameworks/12 multiple gir/gir/meson.build @@ -22,7 +22,8 @@ gnome.generate_gir( symbol_prefix : 'meson_sub_', identifier_prefix : 'MesonSub', includes : ['GObject-2.0', meson_gir], - install : true + install : true, + install_dir_gir: false, ) message('TEST: ' + girsubproject.outdir()) diff --git a/test cases/frameworks/12 multiple gir/test.json b/test cases/frameworks/12 multiple gir/test.json index 4ccecc8..9774402 100644 --- a/test cases/frameworks/12 multiple gir/test.json +++ b/test cases/frameworks/12 multiple gir/test.json @@ -6,8 +6,7 @@ {"type": "file", "platform": "cygwin", "file": "usr/lib/libgirlib.dll.a"}, {"type": "expr", "file": "usr/lib/?libgirsubproject.so"}, {"type": "file", "platform": "cygwin", "file": "usr/lib/libgirsubproject.dll.a"}, - {"type": "file", "file": "usr/share/gir-1.0/Meson-1.0.gir"}, - {"type": "file", "file": "usr/share/gir-1.0/MesonSub-1.0.gir"} + {"type": "file", "file": "usr/share/gir-1.0/Meson-1.0.gir"} ], "skip_on_jobname": ["azure", "macos", "msys2"] } -- cgit v1.1