diff options
author | Brad King <brad.king@kitware.com> | 2023-03-30 12:51:06 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2023-03-30 12:51:18 (GMT) |
commit | 4901fdb201bc6264e976e105780a490d9c0eba19 (patch) | |
tree | a9f1ac305890acb723453d4145987555167395d2 /Tests/RunCMake/CMakePresets/FuturePresetToolchainField-stderr.txt | |
parent | 1d1ee2b049ec3010d1740f276c8a3413ad4c76d3 (diff) | |
parent | 19305afd8a2a46925b1a880de68f7be0ad1f3091 (diff) | |
download | CMake-4901fdb201bc6264e976e105780a490d9c0eba19.zip CMake-4901fdb201bc6264e976e105780a490d9c0eba19.tar.gz CMake-4901fdb201bc6264e976e105780a490d9c0eba19.tar.bz2 |
Merge topic 'presets-json-errors'
19305afd8a presets: Improve JSON parser and error messages
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8290
Diffstat (limited to 'Tests/RunCMake/CMakePresets/FuturePresetToolchainField-stderr.txt')
-rw-r--r-- | Tests/RunCMake/CMakePresets/FuturePresetToolchainField-stderr.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/RunCMake/CMakePresets/FuturePresetToolchainField-stderr.txt b/Tests/RunCMake/CMakePresets/FuturePresetToolchainField-stderr.txt index 9382423..7aedc6d 100644 --- a/Tests/RunCMake/CMakePresets/FuturePresetToolchainField-stderr.txt +++ b/Tests/RunCMake/CMakePresets/FuturePresetToolchainField-stderr.txt @@ -1,2 +1,3 @@ ^CMake Error: Could not read presets from [^ -]*/Tests/RunCMake/CMakePresets/FuturePresetToolchainField: File version must be 3 or higher for toolchainFile preset support.$ +]*/Tests/RunCMake/CMakePresets/FuturePresetToolchainField: +File version must be 3 or higher for toolchainFile preset support$ |