summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-03-12 19:26:45 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-03-12 19:26:45 (GMT)
commit6390d5f5cb107dcc4a0bc6124ab5f17370dcadcd (patch)
tree63a42b18d2e151f28d69915cdd85955039e3999a /Help
parent0d58b082d00b8dc0fc678911e6e3c489c0bd5a9a (diff)
parentec428fafcf9f50c54b163dd16f68063cc387f779 (diff)
downloadCMake-6390d5f5cb107dcc4a0bc6124ab5f17370dcadcd.zip
CMake-6390d5f5cb107dcc4a0bc6124ab5f17370dcadcd.tar.gz
CMake-6390d5f5cb107dcc4a0bc6124ab5f17370dcadcd.tar.bz2
Merge topic 'refactor-cmGeneratorExpression'
ec428faf Genex: Extend cmGeneratorExpressionContext constructor. 082b6a9d Genex: Split cmGeneratorExpressionContext into own file. 9df1f0fc Genex: Split cmGeneratorExpressionNode into own file. 80b9f0cb Genex: Extract an evaluateWithContext method. 642048ce Help: Move docs of $<0:...> and $<1:...> to output section.
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-generator-expressions.7.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index d38cf7e..477a132 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -40,10 +40,6 @@ otherwise expands to nothing.
Available logical expressions are:
-``$<0:...>``
- Empty string (ignores ``...``)
-``$<1:...>``
- Content of ``...``
``$<BOOL:...>``
``1`` if the ``...`` is true, else ``0``
``$<AND:?[,?]...>``
@@ -241,6 +237,10 @@ where ``${prop}`` refers to a helper variable::
Available output expressions are:
+``$<0:...>``
+ Empty string (ignores ``...``)
+``$<1:...>``
+ Content of ``...``
``$<JOIN:list,...>``
Joins the list with the content of ``...``
``$<ANGLE-R>``