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, master has been updated
via 3603b3964b308273725198cafdc2ce78a80fa862 (commit)
via dcf11cbcdcfc15f44e07821ded87252ec31bc40b (commit)
from 9fee70422783af120bdaeff62ba77a71226f611d (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=3603b3964b308273725198cafdc2ce78a80fa862
commit 3603b3964b308273725198cafdc2ce78a80fa862
Merge: 9fee704 dcf11cb
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 13 18:40:48 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 13 13:40:55 2018 -0500
Merge topic 'macro'
dcf11cbcdc Help: Mention endmacro argument as legacy only.
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2606
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcf11cbcdcfc15f44e07821ded87252ec31bc40b
commit dcf11cbcdcfc15f44e07821ded87252ec31bc40b
Author: Joachim Wuttke (l) <j.wut...@fz-juelich.de>
AuthorDate: Mon Nov 12 22:36:35 2018 +0100
Commit: Joachim Wuttke (o) <j.wut...@fz-juelich.de>
CommitDate: Tue Nov 13 12:14:55 2018 +0100
Help: Mention endmacro argument as legacy only.
Same change as previously done for function, if, while, ...
diff --git a/Help/command/macro.rst b/Help/command/macro.rst
index 2746b1b..287855b 100644
--- a/Help/command/macro.rst
+++ b/Help/command/macro.rst
@@ -7,7 +7,7 @@ Start recording a macro for later invocation as a command
macro(<name> [<arg1> ...])
<commands>
- endmacro(<name>)
+ endmacro()
Defines a macro named ``<name>`` that takes arguments
named ``<arg1>``, ...
@@ -31,6 +31,11 @@ behavior. Checking that ``${ARGC}`` is greater than ``#`` is
the only
way to ensure that ``${ARGV#}`` was passed to the function as an extra
argument.
+Per legacy, the :command:`endmacro` command admits an optional
+``<name>`` argument. If used, it must be a verbatim repeat of the
+argument of the opening ``macro`` command.
+
+
See the :command:`cmake_policy()` command documentation for the behavior
of policies inside macros.
-----------------------------------------------------------------------
Summary of changes:
Help/command/macro.rst | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
