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 ed593cbe645d7e5a0131b0695a607999e70af5c6 (commit)
via 711f1bf1db0bbfb64323f81ee52864560776ebff (commit)
via b7b7f1806acf8aabd5cd99e3d08fac15f4f95bdc (commit)
via 902af25512545db441043ea8f1fd2637fa1e1129 (commit)
from c0e763d6880e842d8fc874e58c93583e014bd988 (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=ed593cbe645d7e5a0131b0695a607999e70af5c6
commit ed593cbe645d7e5a0131b0695a607999e70af5c6
Merge: 711f1bf 902af25
Author: Craig Scott
AuthorDate: Mon May 27 21:55:29 2019 +
Commit: Kitware Robot
CommitDate: Mon May 27 17:55:45 2019 -0400
Merge topic 'doc-typo-CTEST_CUSTOM_WARNING_xxx'
902af25512 Help: Fix typo for CTEST_CUSTOM_WARNING_xxx vars
Acked-by: Kitware Robot
Merge-request: !3378
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=711f1bf1db0bbfb64323f81ee52864560776ebff
commit 711f1bf1db0bbfb64323f81ee52864560776ebff
Merge: c0e763d b7b7f18
Author: Craig Scott
AuthorDate: Mon May 27 21:53:04 2019 +
Commit: Kitware Robot
CommitDate: Mon May 27 17:53:43 2019 -0400
Merge topic 'doc-install-export-android-mk'
b7b7f1806a Help: Fix typo in install(EXPORT_ANDROID_MK) example
Acked-by: Kitware Robot
Merge-request: !3376
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7b7f1806acf8aabd5cd99e3d08fac15f4f95bdc
commit b7b7f1806acf8aabd5cd99e3d08fac15f4f95bdc
Author: John Freeman
AuthorDate: Sat May 25 14:57:08 2019 -0400
Commit: John Freeman
CommitDate: Sun May 26 09:09:07 2019 -0500
Help: Fix typo in install(EXPORT_ANDROID_MK) example
diff --git a/Help/command/install.rst b/Help/command/install.rst
index 7571aae..ab6fef6 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -660,9 +660,9 @@ and installed by the current project. For example, the code
install(TARGETS myexe EXPORT myproj DESTINATION bin)
install(EXPORT myproj NAMESPACE mp_ DESTINATION lib/myproj)
- install(EXPORT_ANDROID_MK myexp DESTINATION share/ndk-modules)
+ install(EXPORT_ANDROID_MK myproj DESTINATION share/ndk-modules)
-will install the executable myexe to ``/bin`` and code to import
+will install the executable ``myexe`` to ``/bin`` and code to import
it in the file ``/lib/myproj/myproj.cmake`` and
``/share/ndk-modules/Android.mk``. An outside project
may load this file with the include command and reference the ``myexe``
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=902af25512545db441043ea8f1fd2637fa1e1129
commit 902af25512545db441043ea8f1fd2637fa1e1129
Author: Craig Scott
AuthorDate: Sun May 26 22:30:39 2019 +1000
Commit: Craig Scott
CommitDate: Sun May 26 22:31:23 2019 +1000
Help: Fix typo for CTEST_CUSTOM_WARNING_xxx vars
These variables apply to the `ctest_build` command, not `ctest_test`
Relates: #19217
diff --git a/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst
b/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst
index 36fa37d..a03d473 100644
--- a/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst
+++ b/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst
@@ -2,6 +2,6 @@ CTEST_CUSTOM_WARNING_EXCEPTION
--
A list of regular expressions which will be used to exclude when detecting
-warning messages in build outputs by the :command:`ctest_test` command.
+warning messages in build outputs by the :command:`ctest_build` command.
.. include:: CTEST_CUSTOM_XXX.txt
diff --git a/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst
b/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst
index a35be96..18aa6b3 100644
--- a/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst
+++ b/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst
@@ -2,6 +2,6 @@ CTEST_CUSTOM_WARNING_MATCH
--
A list of regular expressions which will be used to detect warning messages in
-build outputs by the :command:`ctest_test` command.
+build outputs by the :command:`ctest_build` command.
.. include:: CTEST_CUSTOM_XXX.txt
---
Summary of changes:
Help/command/install.rst | 4 ++--
Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst | 2 +-
Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits