diff options
author | Brad King <brad.king@kitware.com> | 2020-06-29 12:25:34 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-29 12:25:42 (GMT) |
commit | f2b84d24cfccf49b6332cf3f2ca164fd71ae023e (patch) | |
tree | 67d3b6500279ec0a57498d534bc2be747ec84a41 /Tests/RunCMake/CommandLine | |
parent | 3453d797a57591ec6e6f0ed8e9a03f6298d7cd18 (diff) | |
parent | 7d6861f367673b57bf45e14863f1104e8e28eafa (diff) | |
download | CMake-f2b84d24cfccf49b6332cf3f2ca164fd71ae023e.zip CMake-f2b84d24cfccf49b6332cf3f2ca164fd71ae023e.tar.gz CMake-f2b84d24cfccf49b6332cf3f2ca164fd71ae023e.tar.bz2 |
Merge topic 'fileApiAddLanguageStandardBacktrace'
7d6861f367 fileapi: Extend codemodel targets with language standard
ba835874a4 Add backtrace support for language standard
e43486a639 cmGeneratorTarget: Clarify name of language property lookup helper
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4798
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 03286f1..e24e131 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":1}]},{"kind":"cache","version":\[{"major":2,"minor":0}]},{"kind":"cmakeFiles","version":\[{"major":1,"minor":0}]}]},"generators":\[.*\],"serverMode":true,"version":{.*}}$ +^{"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":true,"version":{.*}}$ |