diff options
| author | Craig Scott <craig.scott@crascit.com> | 2019-07-09 12:42:51 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2019-07-09 12:42:51 (GMT) |
| commit | d7673a203ca41c2d05462839b818b0803b05ae1e (patch) | |
| tree | eaec06219caf8907fdd612857ea63666b5e41b6c | |
| parent | 12e46dc413193c42589918bc588b5a41774329a8 (diff) | |
| parent | 14ed40d670e522e33b89102a1e2bb2aed10d0590 (diff) | |
| download | CMake-d7673a203ca41c2d05462839b818b0803b05ae1e.zip CMake-d7673a203ca41c2d05462839b818b0803b05ae1e.tar.gz CMake-d7673a203ca41c2d05462839b818b0803b05ae1e.tar.bz2 | |
Merge branch 'loglevel-option-case-consistency' into release-3.15
Merge-request: !3521
| -rw-r--r-- | Help/manual/cmake.1.rst | 4 | ||||
| -rw-r--r-- | Source/cmakemain.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index ff099dd..7b5399d 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 " |