From e39766d84a5eef0d9590e6a5980e9cc0c43e1900 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 18 Mar 2020 16:02:04 -0400 Subject: Help: Fix documentation of --trace-format parameter --- Help/manual/cmake.1.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 44b1f2f..28a081f 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. -- cgit v0.12 From 1994f950fff32cfcc20823269e008a34bfe6acf0 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 18 Mar 2020 16:16:46 -0400 Subject: cmake: List valid values for --trace-format on the command line --- Source/cmake.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f4b9f16..a99d9a6 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -751,7 +751,8 @@ void cmake::SetArgs(const std::vector& 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); -- cgit v0.12