aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Subprojects.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-10-14 19:40:34 +0300
committerGitHub <noreply@github.com>2020-10-14 19:40:34 +0300
commit30d78f39812a0585a27e24ab44ef4e9da1f12574 (patch)
tree437f8b5d8e63e900f5b41923dcd33fc3950fe4f9 /docs/markdown/Subprojects.md
parent8b8a610ea4ed632759b831606723d1cafa8920d7 (diff)
parent3a0182378612bc764667328805b11bc92db696c2 (diff)
downloadmeson-30d78f39812a0585a27e24ab44ef4e9da1f12574.zip
meson-30d78f39812a0585a27e24ab44ef4e9da1f12574.tar.gz
meson-30d78f39812a0585a27e24ab44ef4e9da1f12574.tar.bz2
Merge pull request #6968 from xclaesse/auto-promote
Merge wraps from subprojects into wraps from main project
Diffstat (limited to 'docs/markdown/Subprojects.md')
-rw-r--r--docs/markdown/Subprojects.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/markdown/Subprojects.md b/docs/markdown/Subprojects.md
index 7e17afa..e8adc96 100644
--- a/docs/markdown/Subprojects.md
+++ b/docs/markdown/Subprojects.md
@@ -258,6 +258,13 @@ the following command-line options:
`glib-2.0` must also be forced to fallback, in this case with
`--force-fallback-for=glib,gsteamer`.
+* **--wrap-mode=nopromote**
+
+ *Since 0.56.0* Meson will automatically use wrap files found in subprojects
+ and copy them into the main project. That new behavior can be disabled by
+ passing `--wrap-mode=nopromote`. In that case only wraps found in the main
+ project will be used.
+
## `meson subprojects` command
*Since 0.49.0*