aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-07-13 11:03:46 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2019-07-17 19:20:33 +0300
commit3b3f53ab55f3f232c195f070b36f433bb8c5c60c (patch)
treeda33a5762a6380059443927be0a70174d113827b /docs
parent341d245e6841bbdadddb89450731a6dbae8b7fe2 (diff)
downloadmeson-3b3f53ab55f3f232c195f070b36f433bb8c5c60c.zip
meson-3b3f53ab55f3f232c195f070b36f433bb8c5c60c.tar.gz
meson-3b3f53ab55f3f232c195f070b36f433bb8c5c60c.tar.bz2
mintro: Fix section key in buildoptions
This reverts the changes to the `section` key for the buildoptions and moves the machine choice into it's own `machine` key. With this commit the __undocumented__ breaking change to the introspection format (introduced in 0.51.0) is reverted and a new key is added instead.
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/IDE-integration.md10
1 files changed, 9 insertions, 1 deletions
diff --git a/docs/markdown/IDE-integration.md b/docs/markdown/IDE-integration.md
index 21226c9..9ed61c7 100644
--- a/docs/markdown/IDE-integration.md
+++ b/docs/markdown/IDE-integration.md
@@ -143,7 +143,8 @@ the `intro-buildoptions.json` file. Here is the JSON format for each option.
"description": "the description",
"type": "type ID",
"value": "value depends on type",
- "section": "section ID"
+ "section": "section ID",
+ "machine": "machine ID"
}
```
@@ -168,6 +169,13 @@ The possible values for `section` are:
- user
- test
+The `machine` key specifies the machine configuration for the option. Possible
+values are:
+
+ - any
+ - host
+ - build
+
To set the options, use the `meson configure` command.
Since Meson 0.50.0 it is also possible to get the default buildoptions