mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'string-JSON-error-modes'

Browse Source 
93dce4b4bf string(JSON): fix error message on invalid mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7130
This commit is contained in:
Brad King
2022-03-31 12:51:57 +00:00
committed by Kitware Robot
parent 840fb95904 93dce4b4bf
commit 7ae3c6740b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmStringCommand.cxx
View File

@@ -1106,8 +1106,8 @@ bool HandleJSONCommand(std::vector<std::string> const& arguments,
mode != "EQUAL"_s) {
throw json_error(
{ "got an invalid mode '"_s, mode,
"', expected one of GET, GET_ARRAY, TYPE, MEMBER, MEMBERS,"
" LENGTH, REMOVE, SET, EQUAL"_s });
"', expected one of GET, TYPE, MEMBER, LENGTH, REMOVE, SET, "
" EQUAL"_s });
}
const auto& jsonstr = args.PopFront("missing json string argument"_s);

2
Tests/RunCMake/string/JSONWrongMode-stderr.txt
View File

@@ -1,5 +1,5 @@
CMake Error at JSONWrongMode.cmake:1 \(string\):
string sub-command JSON got an invalid mode 'FOO', expected one of GET,
GET_ARRAY, TYPE, MEMBER, MEMBERS, LENGTH, REMOVE, SET, EQUAL.
TYPE, MEMBER, LENGTH, REMOVE, SET, EQUAL.
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)