summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-05-25 10:25:50 +0200
committerXavier Claessens <xclaesse@gmail.com>2020-05-26 13:48:26 -0400
commitc9cd235af4b58b169c30fa497f0adae4e69c5f4c (patch)
treeced1e22b17395a48d101bc34591f7adfad8a0a81
parent534b340a56419b9e5b892eef9d8b3fa3bb647afe (diff)
downloadmeson-c9cd235af4b58b169c30fa497f0adae4e69c5f4c.tar.gz
opts: added docs
-rw-r--r--docs/markdown/Build-options.md3
-rw-r--r--docs/markdown/snippets/options_string_concat.md14
2 files changed, 17 insertions, 0 deletions
diff --git a/docs/markdown/Build-options.md b/docs/markdown/Build-options.md
index 2d53e287b..429b9b2ca 100644
--- a/docs/markdown/Build-options.md
+++ b/docs/markdown/Build-options.md
@@ -20,6 +20,9 @@ option('integer_opt', type : 'integer', min : 0, max : 5, value : 3) # Since 0.4
option('free_array_opt', type : 'array', value : ['one', 'two']) # Since 0.44.0
option('array_opt', type : 'array', choices : ['one', 'two', 'three'], value : ['one', 'two'])
option('some_feature', type : 'feature', value : 'enabled') # Since 0.47.0
+option('long_desc', type : 'string', value : 'optval',
+ description : 'An option with a very long description' +
+ 'that does something in a specific context') # Since 0.55.0
```
For built-in options, see [Built-in options][builtin_opts].
diff --git a/docs/markdown/snippets/options_string_concat.md b/docs/markdown/snippets/options_string_concat.md
new file mode 100644
index 000000000..0fbf0f4b9
--- /dev/null
+++ b/docs/markdown/snippets/options_string_concat.md
@@ -0,0 +1,14 @@
+## String concatenation in meson_options.txt
+
+It is now possible to use string concatenation (with the `+` opperator) in the
+meson_options.txt file. This allows splitting long option descriptions.
+
+```meson
+option(
+ 'testoption',
+ type : 'string',
+ value : 'optval',
+ description : 'An option with a very long description' +
+ 'that does something in a specific context'
+)
+```