diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/markdown/snippets/option_dict.md | 5 | ||||
| -rw-r--r-- | docs/yaml/functions/_build_target_base.yaml | 3 | ||||
| -rw-r--r-- | docs/yaml/functions/dependency.yaml | 3 | ||||
| -rw-r--r-- | docs/yaml/functions/project.yaml | 4 | ||||
| -rw-r--r-- | docs/yaml/functions/subproject.yaml | 12 |
5 files changed, 19 insertions, 8 deletions
diff --git a/docs/markdown/snippets/option_dict.md b/docs/markdown/snippets/option_dict.md new file mode 100644 index 0000000..79cca5f --- /dev/null +++ b/docs/markdown/snippets/option_dict.md @@ -0,0 +1,5 @@ +## default_options and override_options may now be dictionaries + +Instead of passing them as `default_options : ['key=value']`, they can now be +passed as `default_options : {'key': 'value'}`, and the same for +`override_options`. diff --git a/docs/yaml/functions/_build_target_base.yaml b/docs/yaml/functions/_build_target_base.yaml index abc5bf9..f863288 100644 --- a/docs/yaml/functions/_build_target_base.yaml +++ b/docs/yaml/functions/_build_target_base.yaml @@ -228,12 +228,13 @@ kwargs: Set this to `[]`, or omit the keyword argument for the default behaviour. override_options: - type: list[str] + type: list[str] | dict[str] since: 0.40.0 description: | takes an array of strings in the same format as `project`'s `default_options` overriding the values of these options for this target only. + *(since 1.2.0)*: A dictionary may now be passed. gnu_symbol_visibility: type: str diff --git a/docs/yaml/functions/dependency.yaml b/docs/yaml/functions/dependency.yaml index 85255b9..6a628bd 100644 --- a/docs/yaml/functions/dependency.yaml +++ b/docs/yaml/functions/dependency.yaml @@ -78,7 +78,7 @@ varargs: kwargs: default_options: - type: list[str] + type: list[str] | dict[str] since: 0.38.0 description: | An array of default option values @@ -86,6 +86,7 @@ kwargs: (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 1.2.0)*: A dictionary may now be passed. allow_fallback: type: bool diff --git a/docs/yaml/functions/project.yaml b/docs/yaml/functions/project.yaml index 59595cd..6eb7adc 100644 --- a/docs/yaml/functions/project.yaml +++ b/docs/yaml/functions/project.yaml @@ -38,7 +38,7 @@ varargs: kwargs: default_options: - type: list[str] + type: list[str] | dict[str] description: | Accepts strings in the form `key=value` which have the same format as options to `meson configure`. @@ -54,6 +54,8 @@ kwargs: environment variable is not used. Consider using [[add_project_arguments()]] instead. + *(since 1.2.0)*: A dictionary may now be passed. + version: type: str | file description: | diff --git a/docs/yaml/functions/subproject.yaml b/docs/yaml/functions/subproject.yaml index 14a778d..3017c20 100644 --- a/docs/yaml/functions/subproject.yaml +++ b/docs/yaml/functions/subproject.yaml @@ -12,8 +12,9 @@ description: | that override those set in the subproject's `meson.options` (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). + *(since 0.54.0)*: `default_library` built-in option can also be overridden. + *(since 1.2.0)*: A dictionary may be passed instead of array. - `version`: works just like the same as in `dependency`. It specifies what version the subproject should be, as an example `>=1.0.1` - `required` *(since 0.48.0)*: By default, `required` is `true` and @@ -41,15 +42,16 @@ posargs: kwargs: default_options: - type: list[str] + type: list[str] | dict[str] since: 0.37.0 description: | An array of default option values that override those set in the subproject's `meson.options` (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). + *(since 0.54.0)*: `default_library` built-in option can also be overridden. + *(since 1.2.0)*: A dictionary may now be passed. version: type: str |