diff options
author | Brad King <brad.king@kitware.com> | 2021-01-14 18:02:47 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-14 18:02:54 (GMT) |
commit | cc47f4ebf98c42ca442f38344fad16f1679eee9e (patch) | |
tree | d93f50e945a2654ac81cf0323febc0595e34877a /Tests/RunCMake/CommandLine | |
parent | 224956255d24f85ba1ce5d34b0864d8271bff32e (diff) | |
parent | 6418dabb8797a0fe64ddde2e89ae688e984f59d3 (diff) | |
download | CMake-cc47f4ebf98c42ca442f38344fad16f1679eee9e.zip CMake-cc47f4ebf98c42ca442f38344fad16f1679eee9e.tar.gz CMake-cc47f4ebf98c42ca442f38344fad16f1679eee9e.tar.bz2 |
Merge topic 'fileapi-toolchains'
6418dabb87 Tests: Add test for toolchains-v1 File API object
1c5bd1bed5 Tests: Add toolchains kind to capabilities test
f72bb2ee0d Help: Add documentation for "toolchains" object kind
bb069c0857 cmFileAPI: Add "toolchains" object kind.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5678
Diffstat (limited to 'Tests/RunCMake/CommandLine')
-rw-r--r-- | Tests/RunCMake/CommandLine/E_capabilities-stdout.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/CommandLine/E_capabilities-stdout.txt b/Tests/RunCMake/CommandLine/E_capabilities-stdout.txt index a8b6584..c76c92d 100644 --- a/Tests/RunCMake/CommandLine/E_capabilities-stdout.txt +++ b/Tests/RunCMake/CommandLine/E_capabilities-stdout.txt @@ -1 +1 @@ -^{"fileApi":{"requests":\[{"kind":"codemodel","version":\[{"major":2,"minor":2}]},{"kind":"cache","version":\[{"major":2,"minor":0}]},{"kind":"cmakeFiles","version":\[{"major":1,"minor":0}]}]},"generators":\[.*\],"serverMode":false,"version":{.*}}$ +^{"fileApi":{"requests":\[{"kind":"codemodel","version":\[{"major":2,"minor":2}]},{"kind":"cache","version":\[{"major":2,"minor":0}]},{"kind":"cmakeFiles","version":\[{"major":1,"minor":0}]},{"kind":"toolchains","version":\[{"major":1,"minor":0}]}]},"generators":\[.*\],"serverMode":false,"version":{.*}}$ |