diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-12 15:40:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-06-12 15:40:47 (GMT) |
| commit | 1492dc8301ba5844b830316bcc2677aa1bdae897 (patch) | |
| tree | 56f1af1d78a045b3d196d2dbdc6aebbb9ae1096a /Tests/RunCMake | |
| parent | b7d72db89de6a9ddc8c8740a6e8b8980d108b900 (diff) | |
| parent | c932f498426609beb14b9339c2a7dec3ea624998 (diff) | |
| download | CMake-1492dc8301ba5844b830316bcc2677aa1bdae897.zip CMake-1492dc8301ba5844b830316bcc2677aa1bdae897.tar.gz CMake-1492dc8301ba5844b830316bcc2677aa1bdae897.tar.bz2 | |
Merge topic 'capabilities-fileapi'
c932f49842 cmake: Teach -E capabilities to report supported fileapi requests
6696855f72 cmake: Simplify implementation of -E capabilities
6b815e58ba fileapi: Factor out helper to construct a version object
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3433
Diffstat (limited to 'Tests/RunCMake')
| -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 6c5ea44..b4b170e 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":0}]},{"kind":"cache","version":\[{"major":2,"minor":0}]},{"kind":"cmakeFiles","version":\[{"major":1,"minor":0}]}]},"generators":\[.*\],"serverMode":true,"version":{.*}}$ |