diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-19 10:57:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-19 10:57:52 (GMT) |
| commit | 0586123ede37a1b9bc1e52a2d62bf3ff79f1dec5 (patch) | |
| tree | d337388893f9eca48fb3465ac77e7d15e7f45174 | |
| parent | d995be9ead29c2f970c789e831f7601b0654ee34 (diff) | |
| parent | 1994f950fff32cfcc20823269e008a34bfe6acf0 (diff) | |
| download | CMake-0586123ede37a1b9bc1e52a2d62bf3ff79f1dec5.zip CMake-0586123ede37a1b9bc1e52a2d62bf3ff79f1dec5.tar.gz CMake-0586123ede37a1b9bc1e52a2d62bf3ff79f1dec5.tar.bz2 | |
Merge topic 'trace-format-json-doc'
1994f950ff cmake: List valid values for --trace-format on the command line
e39766d84a Help: Fix documentation of --trace-format parameter
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4500
| -rw-r--r-- | Help/manual/cmake.1.rst | 2 | ||||
| -rw-r--r-- | Source/cmake.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 429cba4..e497890 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -266,7 +266,7 @@ Options Prints each trace line in a human-readable format. This is the default format. - ``json`` + ``json-v1`` Prints each line as a separate JSON document. Each document is separated by a newline ( ``\n`` ). It is guaranteed that no newline characters will be present inside a JSON document. diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 29ed61d..5f04ea3 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -759,7 +759,8 @@ void cmake::SetArgs(const std::vector<std::string>& args) const auto traceFormat = StringToTraceFormat(arg.substr(strlen("--trace-format="))); if (traceFormat == TraceFormat::TRACE_UNDEFINED) { - cmSystemTools::Error("Invalid format specified for --trace-format"); + cmSystemTools::Error("Invalid format specified for --trace-format. " + "Valid formats are human, json-v1."); return; } this->SetTraceFormat(traceFormat); |