aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Behle <behlec@gmail.com>2018-06-11 21:59:16 +0200
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-12 00:14:54 +0000
commitb08902a60ff19992b79d140db304b09c3bc44e7a (patch)
tree5204bddc14ef31e8a033f009badb428204c3c385
parentf2622133e29e85efdc2ab5ea33942f7c9097c1af (diff)
downloadmeson-b08902a60ff19992b79d140db304b09c3bc44e7a.zip
meson-b08902a60ff19992b79d140db304b09c3bc44e7a.tar.gz
meson-b08902a60ff19992b79d140db304b09c3bc44e7a.tar.bz2
Improved documentation.
Added entry to release notes. Added note to documentation, regarding from which version on the behavior is changed.
-rw-r--r--docs/markdown/Reference-manual.md4
-rw-r--r--docs/markdown/Release-notes-for-0.47.0.md6
2 files changed, 8 insertions, 2 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index f0fe93e..0966c0e 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -1575,8 +1575,8 @@ the following methods:
- `get_define(definename)` returns the given preprocessor symbol's
value as a string or empty string if it is not defined.
- The method will concatenate string literals as the compiler would.
- E.g. `"a" "b"` will become `"ab"`.
+ Starting with 0.47.0, this method will concatenate string literals as
+ the compiler would. E.g. `"a" "b"` will become `"ab"`.
- `get_id()` returns a string identifying the compiler. For example,
`gcc`, `msvc`, [and more](Reference-tables.html#compiler-ids).
diff --git a/docs/markdown/Release-notes-for-0.47.0.md b/docs/markdown/Release-notes-for-0.47.0.md
index 58d47ee..fa4a34c 100644
--- a/docs/markdown/Release-notes-for-0.47.0.md
+++ b/docs/markdown/Release-notes-for-0.47.0.md
@@ -21,3 +21,9 @@ Added the function `subdir_done()`. Its invocation exits the current script at
the point of invocation. All previously invoked build targets and commands are
build/executed. All following ones are ignored. If the current script was
invoked via `subdir()` the parent script continues normally.
+
+## Concatenate string literals returned from get_define
+
+After obtaining the value of a preprocessor symbol consecutive string literals
+are merged into a single string literal.
+For example a preprocessor symbol's value `"ab" "cd"` is returned as `"abcd"`.