diff options
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Reference-manual.md | 3 | ||||
| -rw-r--r-- | docs/markdown/snippets/per_subproject_builtin.md | 15 |
2 files changed, 1 insertions, 17 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index 510d44323..ae6d1c5a8 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -1553,8 +1553,7 @@ arguments: that override those set in the subproject's `meson_options.txt` (like `default_options` in `project`, they only have effect when Meson is run for the first time, and command line arguments override - any default options in build files). *Since 0.54.0* `default_library` - built-in option can also be overridden. + any default options in build files) - `version` keyword argument that works just like the one in `dependency`. It specifies what version the subproject should be, as an example `>=1.0.1` diff --git a/docs/markdown/snippets/per_subproject_builtin.md b/docs/markdown/snippets/per_subproject_builtin.md deleted file mode 100644 index 44ed1c866..000000000 --- a/docs/markdown/snippets/per_subproject_builtin.md +++ /dev/null @@ -1,15 +0,0 @@ -## Per subproject `default_library` option - -The `default_library` built-in option can now be defined per subproject. This is -useful for example when building shared libraries in the main project, but static -link a subproject. - -Most of the time this would be used either by the parent project by setting -subproject's default_options (e.g. `subproject('foo', default_options: 'default_library=static')`), -or by the user using the command line `-Dfoo:default_library=static`. - -The value is overriden in this order: -- Value from parent project -- Value from subproject's default_options if set -- Value from subproject() default_options if set -- Value from command line if set |