diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-06-12 11:57:25 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2020-07-01 09:51:57 -0400 |
| commit | 95c3fee47d75ef493865b3ffbcea7989ef246287 (patch) | |
| tree | 5639a33f052016130bfada3ff1c043ad5be77ed9 /docs | |
| parent | 41aefd2145bf287c9c07139a7334845f8c03374c (diff) | |
| download | meson-95c3fee47d75ef493865b3ffbcea7989ef246287.zip meson-95c3fee47d75ef493865b3ffbcea7989ef246287.tar.gz meson-95c3fee47d75ef493865b3ffbcea7989ef246287.tar.bz2 | |
wrap: Update doc to give dependency_names example first
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/markdown/Wrap-dependency-system-manual.md | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/markdown/Wrap-dependency-system-manual.md b/docs/markdown/Wrap-dependency-system-manual.md index c96c73a..0ff304d 100644 --- a/docs/markdown/Wrap-dependency-system-manual.md +++ b/docs/markdown/Wrap-dependency-system-manual.md @@ -156,28 +156,28 @@ where `dependency_name` usually match the corresponding pkg-config name and `variable_name` is the name of a variable defined in the subproject that should be returned for that dependency. -For example `glib.wrap` provides `glib-2.0`, `gobject-2.0` and `gio-2.0`. A wrap -file for glib would look like: +For example when using a recent enough version of glib that uses +`meson.override_dependency()` to override `glib-2.0`, `gobject-2.0` and `gio-2.0`, +a wrap file would look like: ```ini [wrap-git] url=https://gitlab.gnome.org/GNOME/glib.git revision=glib-2-62 [provide] -glib-2.0=glib_dep -gobject-2.0=gobject_dep -gio-2.0=gio_dep +dependency_names = glib-2.0, gobject-2.0, gio-2.0 ``` -Alternatively, when using a recent enough version of glib that uses -`meson.override_dependency()`: +With older version of glib dependency variable names need to be specified: ```ini [wrap-git] url=https://gitlab.gnome.org/GNOME/glib.git revision=glib-2-62 [provide] -dependency_names = glib-2.0, gobject-2.0, gio-2.0 +glib-2.0=glib_dep +gobject-2.0=gobject_dep +gio-2.0=gio_dep ``` With such wrap file, `dependency('glib-2.0')` will automatically fallback to use |