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 fba5980fa6d94c101e8729414bb4f787fb310b68 (commit)
via b95eda9b11ff2ba8baccf6208bb43c4c3cfa3479 (commit)
from 213ecf05d681522dfa6ca8396281494a2c7b7b9a (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=fba5980fa6d94c101e8729414bb4f787fb310b68
commit fba5980fa6d94c101e8729414bb4f787fb310b68
Merge: 213ecf0 b95eda9
Author: Brad King <[email protected]>
AuthorDate: Mon Feb 5 13:47:32 2018 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Mon Feb 5 08:47:36 2018 -0500
Merge topic 'fix_help_cmake_parse_arguments'
b95eda9b Help: Fix code example in cmake_parse_arguments.rst
Acked-by: Kitware Robot <[email protected]>
Merge-request: !1747
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b95eda9b11ff2ba8baccf6208bb43c4c3cfa3479
commit b95eda9b11ff2ba8baccf6208bb43c4c3cfa3479
Author: Kai Wolf <[email protected]>
AuthorDate: Sun Feb 4 08:41:03 2018 +0100
Commit: Kai Wolf <[email protected]>
CommitDate: Sun Feb 4 08:41:03 2018 +0100
Help: Fix code example in cmake_parse_arguments.rst
diff --git a/Help/command/cmake_parse_arguments.rst
b/Help/command/cmake_parse_arguments.rst
index b334a89..efbef54 100644
--- a/Help/command/cmake_parse_arguments.rst
+++ b/Help/command/cmake_parse_arguments.rst
@@ -62,7 +62,7 @@ as the real :command:`install` command:
.. code-block:: cmake
- function(MY_INSTALL)
+ macro(my_install)
set(options OPTIONAL FAST)
set(oneValueArgs DESTINATION RENAME)
set(multiValueArgs TARGETS CONFIGURATIONS)
-----------------------------------------------------------------------
Summary of changes:
Help/command/cmake_parse_arguments.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
https://cmake.org/mailman/listinfo/cmake-commits
