summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-03-31 12:51:57 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-03-31 12:52:04 (GMT)
commit7ae3c6740b6a2dec2807b6dce92f3c468c500bea (patch)
tree4c31c9c616cf9d76c7a47e915546dfa4496aa72e
parent840fb959049f0f6532f95b599aab6289ea82981a (diff)
parent93dce4b4bf698563e4a72f4c265bda82626447a1 (diff)
downloadCMake-7ae3c6740b6a2dec2807b6dce92f3c468c500bea.zip
CMake-7ae3c6740b6a2dec2807b6dce92f3c468c500bea.tar.gz
CMake-7ae3c6740b6a2dec2807b6dce92f3c468c500bea.tar.bz2
Merge topic 'string-JSON-error-modes'
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
-rw-r--r--Source/cmStringCommand.cxx4
-rw-r--r--Tests/RunCMake/string/JSONWrongMode-stderr.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index e5935b8..900854e 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -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);
diff --git a/Tests/RunCMake/string/JSONWrongMode-stderr.txt b/Tests/RunCMake/string/JSONWrongMode-stderr.txt
index c70991b..5668303 100644
--- a/Tests/RunCMake/string/JSONWrongMode-stderr.txt
+++ b/Tests/RunCMake/string/JSONWrongMode-stderr.txt
@@ -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\)