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 /Help/manual | |
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 'Help/manual')
-rw-r--r-- | Help/manual/cmake.1.rst | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 6383faf..54eb244 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -298,7 +298,8 @@ Options "cmd": "add_executable", "args": ["foo", "bar"], "time": 1579512535.9687231, - "frame": 2 + "frame": 2, + "global_frame": 4 } The members are: @@ -325,7 +326,13 @@ Options Timestamp (seconds since epoch) of the function call. ``frame`` - Stack frame depth of the function that was called. + Stack frame depth of the function that was called, within the + context of the ``CMakeLists.txt`` being processed currently. + + ``global_frame`` + Stack frame depth of the function that was called, tracked globally + across all ``CMakeLists.txt`` files involved in the trace. This field + was added in minor version 2 of the ``json-v1`` format. Additionally, the first JSON document outputted contains the ``version`` key for the current major and minor version of the @@ -337,7 +344,7 @@ Options { "version": { "major": 1, - "minor": 1 + "minor": 2 } } |