diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-25 14:40:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-25 14:40:56 (GMT) |
| commit | 15b9b41d72d1de2299dbfd9e4f05c456b7a9124e (patch) | |
| tree | 04a423ef2278228cd3cf31ac51b3a76e1d0ace64 /Tests/RunCMake/CommandLine | |
| parent | 54baf639652a0590825fef4f600645919ef13913 (diff) | |
| parent | 9f6d40ee23113f1317e54d662316752adb9f368e (diff) | |
| download | CMake-15b9b41d72d1de2299dbfd9e4f05c456b7a9124e.zip CMake-15b9b41d72d1de2299dbfd9e4f05c456b7a9124e.tar.gz CMake-15b9b41d72d1de2299dbfd9e4f05c456b7a9124e.tar.bz2 | |
Merge topic 'fileApiAddPrecompileHeadersBacktrace'
9f6d40ee23 fileapi: Extend codemodel targets with PRECOMPILE_HEADERS
b698764a31 Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2
b3812c0e54 Tests: Fix indentation in RunCMake.FileAPI cxx_exe.json
9c48804b69 PCH: Fix source group of per-architecture PCH headers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4684
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 b4b170e..03286f1 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":{.*}}$ +^{"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":{.*}}$ |