mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 02:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

string(JSON): fix error message on invalid mode

Browse Source 
The `GET_ARRAY` and `MEMBERS` modes were removed during development and
review of commit 8eab76eb84 (string(JSON): Adds JSON parsing support to
the string command, 2020-08-24, v3.19.0-rc1~159^2), but were
accidentally left in an error message.
This commit is contained in:
Carlo Teubner
2022-03-30 20:25:18 +01:00
committed by Brad King
parent a7b325e203
commit 93dce4b4bf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmStringCommand.cxx
+2 -2
View File
@@ -1106,8 +1106,8 @@ bool HandleJSONCommand(std::vector<std::string> const& arguments,
mode != "EQUAL"_s) { mode != "EQUAL"_s) {
throw json_error( throw json_error(
{ "got an invalid mode '"_s, mode, { "got an invalid mode '"_s, mode,
"', expected one of GET, GET_ARRAY, TYPE, MEMBER, MEMBERS," "', expected one of GET, TYPE, MEMBER, LENGTH, REMOVE, SET, "
" LENGTH, REMOVE, SET, EQUAL"_s }); " EQUAL"_s });
} }
const auto& jsonstr = args.PopFront("missing json string argument"_s); const auto& jsonstr = args.PopFront("missing json string argument"_s);
Tests/RunCMake/string/JSONWrongMode-stderr.txt
+1 -1
View File
@@ -1,5 +1,5 @@
CMake Error at JSONWrongMode.cmake:1 \(string\): CMake Error at JSONWrongMode.cmake:1 \(string\):
string sub-command JSON got an invalid mode 'FOO', expected one of GET, 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\): Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\) CMakeLists\.txt:[0-9]+ \(include\)