summaryrefslogtreecommitdiff
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-27 09:04:58 -0500
committerCMake Topic Stage <kwrobot@kitware.com>2017-01-27 09:04:58 -0500
commit325c6153088c673569971958f107f6cb97b67c50 (patch)
tree751c3c03e0cc2f6bf96db80859fdb0beaf54f746 /Help
parent0ea578b498059340d575be263f5b6a91581f5ce5 (diff)
parent895f7f16a79428689a263ba5cd9a72647dc8e912 (diff)
downloadcmake-325c6153088c673569971958f107f6cb97b67c50.tar.gz
Merge topic 'genex-if'
895f7f16 Genex: Add `IF` generator expression
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-generator-expressions.7.rst2
-rw-r--r--Help/release/dev/if-genex.rst7
2 files changed, 9 insertions, 0 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 64d15a97ce..3a225adb49 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -51,6 +51,8 @@ Available logical expressions are:
``0`` if all ``?`` are ``0``, else ``1``
``$<NOT:?>``
``0`` if ``?`` is ``1``, else ``1``
+``$<IF:?,true-value...,false-value...>```
+ ``true-value...`` if ``?`` is ``1``, ``false-value...`` if ``?`` is ``0``
``$<STREQUAL:a,b>``
``1`` if ``a`` is STREQUAL ``b``, else ``0``
``$<EQUAL:a,b>``
diff --git a/Help/release/dev/if-genex.rst b/Help/release/dev/if-genex.rst
new file mode 100644
index 0000000000..62be3a7b30
--- /dev/null
+++ b/Help/release/dev/if-genex.rst
@@ -0,0 +1,7 @@
+genex-if
+--------
+
+* A new logical generator expression for immediate-if was added:
+ ``$<IF:cond,true-value,false-value>``. It takes three arguments: One
+ condition, a true-value, and a false-value. Resolves to the true-value if the
+ condition is ``1``, and resolves to the false-value if the condition is ``0``.