[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-492-g2af5a40
Brad King
brad.king at kitware.com
Fri Oct 14 15:42:04 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2af5a4054363955c94feeb26d6b33bdcc2dc5736 (commit)
via 3823ed3ab7a4ae1b0663ae89608386d03cc6709a (commit)
from c7a826a42d0d31dc494da0c07ba23af24b152554 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2af5a4054363955c94feeb26d6b33bdcc2dc5736
commit 2af5a4054363955c94feeb26d6b33bdcc2dc5736
Merge: c7a826a 3823ed3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 14 15:42:03 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 14 15:42:03 2016 -0400
Merge topic 'doc-math-EXPR' into next
3823ed3a Help: Fix math(EXPR) documentation formatting
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3823ed3ab7a4ae1b0663ae89608386d03cc6709a
commit 3823ed3ab7a4ae1b0663ae89608386d03cc6709a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 14 15:41:03 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 14 15:41:49 2016 -0400
Help: Fix math(EXPR) documentation formatting
diff --git a/Help/command/math.rst b/Help/command/math.rst
index d4deb16..f99dc3d 100644
--- a/Help/command/math.rst
+++ b/Help/command/math.rst
@@ -5,9 +5,10 @@ Mathematical expressions.
::
- math(EXPR <output variable> <math expression>)
+ math(EXPR <output-variable> <math-expression>)
``EXPR`` evaluates mathematical expression and returns result in the
-output variable. Example mathematical expression is '5 * ( 10 + 13
-)'. Supported operators are + - * / % | & ^ ~ << >> * / %. They have
-the same meaning as they do in C code.
+output variable. Example mathematical expression is ``5 * (10 + 13)``.
+Supported operators are ``+``, ``-``, ``*``, ``/``, ``%``, ``|``, ``&``,
+``^``, ``~``, ``<<``, ``>>``, and ``(...)``. They have the same meaning
+as they do in C code.
-----------------------------------------------------------------------
Summary of changes:
Help/command/math.rst | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list