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 2113705c5b4d2b86d6ad62eed33ac26c54894025 (commit)
via f02ea912ac9cff2cec857202aecd186cc407163c (commit)
via 14ed40d670e522e33b89102a1e2bb2aed10d0590 (commit)
via 365ee32db88f6de20b01a386dc26d3450800daaf (commit)
from e559a3e9900a7c040de2faf36a196b59e82cdd73 (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=2113705c5b4d2b86d6ad62eed33ac26c54894025
commit 2113705c5b4d2b86d6ad62eed33ac26c54894025
Merge: f02ea91 14ed40d
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Tue Jul 9 12:40:19 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jul 9 08:40:29 2019 -0400
Merge topic 'loglevel-option-case-consistency'
14ed40d670 Help: Use consistent levels for cmake --loglevel and message()
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3521
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f02ea912ac9cff2cec857202aecd186cc407163c
commit f02ea912ac9cff2cec857202aecd186cc407163c
Merge: e559a3e 365ee32
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Tue Jul 9 12:37:04 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jul 9 08:37:17 2019 -0400
Merge topic 'doc-SKIP_RETURN_CODE-range'
365ee32db8 Help: Valid range for test property, SKIP_RETURN_CODE, is 0 to
255, inclusive
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3507
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14ed40d670e522e33b89102a1e2bb2aed10d0590
commit 14ed40d670e522e33b89102a1e2bb2aed10d0590
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Sun Jul 7 18:51:23 2019 +1000
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Mon Jul 8 20:11:33 2019 +1000
Help: Use consistent levels for cmake --loglevel and message()
The message() command requires uppercase log levels. Even
though the cmake --loglevel option is not case sensitive, show
the supported values as uppercase to match the message()
docs as closely as possible, since they are related to the same
feature.
Also fixes the wrong string being shown for the warning level
by cmake --help.
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 13cba71..fe32c51 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -200,11 +200,11 @@ Options
from the top of a binary tree for a CMake project it will dump
additional information such as the cache, log files etc.
-``--loglevel=<error|warning|notice|status|verbose|debug|trace>``
+``--loglevel=<ERROR|WARNING|NOTICE|STATUS|VERBOSE|DEBUG|TRACE>``
Set the log level.
The :command:`message` command will only output messages of the specified
- log level or higher. The default log level is ``status``.
+ log level or higher. The default log level is ``STATUS``.
``--debug-trycompile``
Do not delete the :command:`try_compile` build tree.
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 64026ca..a6348b3 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -96,7 +96,7 @@ static const char* cmDocumentationOptions[][2] = {
"Generate graphviz of dependencies, see "
"CMakeGraphVizOptions.cmake for more." },
{ "--system-information [file]", "Dump information about this system." },
- { "--loglevel=<error|warn|notice|status|verbose|debug|trace>",
+ { "--loglevel=<ERROR|WARNING|NOTICE|STATUS|VERBOSE|DEBUG|TRACE>",
"Set the verbosity of messages from CMake files." },
{ "--debug-trycompile",
"Do not delete the try_compile build tree. Only "
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=365ee32db88f6de20b01a386dc26d3450800daaf
commit 365ee32db88f6de20b01a386dc26d3450800daaf
Author: Stephen Manz <6985-srm...@users.noreply.gitlab.kitware.com>
AuthorDate: Wed Jun 26 09:00:21 2019 -0700
Commit: Stephen Manz <6985-srm...@users.noreply.gitlab.kitware.com>
CommitDate: Tue Jul 2 08:46:49 2019 -0700
Help: Valid range for test property, SKIP_RETURN_CODE, is 0 to 255,
inclusive
diff --git a/Help/prop_test/SKIP_RETURN_CODE.rst
b/Help/prop_test/SKIP_RETURN_CODE.rst
index a05fbf3..3d48c2f 100644
--- a/Help/prop_test/SKIP_RETURN_CODE.rst
+++ b/Help/prop_test/SKIP_RETURN_CODE.rst
@@ -6,4 +6,5 @@ Return code to mark a test as skipped.
Sometimes only a test itself can determine if all requirements for the
test are met. If such a situation should not be considered a hard failure
a return code of the process can be specified that will mark the test as
-``Not Run`` if it is encountered.
+``Not Run`` if it is encountered. Valid values are in the range of
+0 to 255, inclusive.
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake.1.rst | 4 ++--
Help/prop_test/SKIP_RETURN_CODE.rst | 3 ++-
Source/cmakemain.cxx | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
