diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-09 14:04:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-09 14:04:43 (GMT) |
| commit | 3d5466d5e95869380b38e40f8431a19e8a6d458e (patch) | |
| tree | d95c4e980702e0552e7ddf560f392995f17b0dbb /Source | |
| parent | 25003baf50fa31f331fd2abef74dcb41b9db2c06 (diff) | |
| parent | a41d6e4d7a264954bebd6c1c45475647da60e14c (diff) | |
| download | CMake-3d5466d5e95869380b38e40f8431a19e8a6d458e.zip CMake-3d5466d5e95869380b38e40f8431a19e8a6d458e.tar.gz CMake-3d5466d5e95869380b38e40f8431a19e8a6d458e.tar.bz2 | |
Merge topic 'trace-global-frame'
a41d6e4d7a Trace: add global_frame field to json-v1 format
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6954
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 2 | ||||
| -rw-r--r-- | Source/cmake.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 4b1635b..34d3efa 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -302,6 +302,8 @@ void cmMakefile::PrintCommandTrace( val["time"] = cmSystemTools::GetTime(); val["frame"] = static_cast<Json::Value::UInt64>(this->ExecutionStatusStack.size()); + val["global_frame"] = + static_cast<Json::Value::UInt64>(this->RecursionDepth); msg << Json::writeString(builder, val); #endif break; diff --git a/Source/cmake.cxx b/Source/cmake.cxx index ef4e37b..85ac9ca 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1434,7 +1434,7 @@ void cmake::PrintTraceFormatVersion() Json::StreamWriterBuilder builder; builder["indentation"] = ""; version["major"] = 1; - version["minor"] = 1; + version["minor"] = 2; val["version"] = version; msg = Json::writeString(builder, val); #endif |