diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-11-28 00:09:29 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-12-06 20:07:43 -0500 |
| commit | bed55a902c46ad0fb1330a19daaa9834a37d3336 (patch) | |
| tree | fac2bed20c12c6ecb76fa843d44919e2fa8a86dc /test cases/frameworks | |
| parent | 283c65578d6bf4ec221dff4b96e42df378886637 (diff) | |
| download | meson-bed55a902c46ad0fb1330a19daaa9834a37d3336.zip meson-bed55a902c46ad0fb1330a19daaa9834a37d3336.tar.gz meson-bed55a902c46ad0fb1330a19daaa9834a37d3336.tar.bz2 | |
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
Diffstat (limited to 'test cases/frameworks')
| -rw-r--r-- | test cases/frameworks/12 multiple gir/gir/meson.build | 3 | ||||
| -rw-r--r-- | test cases/frameworks/12 multiple gir/test.json | 3 |
2 files changed, 3 insertions, 3 deletions
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"] } |