mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

Merge topic 'jsonstate-plist'

Browse Source 
44d8022322 cmPListParser: Use cmJSONState to read plist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12365
This commit is contained in:
Brad King
2026-08-05 15:11:54 -04:00
committed by Kitware Robot
parent bed4c8ba28 44d8022322
commit 11c6315fc3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmPlistParser.cxx
+4 -3
View File
@@ -4,9 +4,9 @@
#include <vector>
#include <cm3p/json/reader.h>
#include <cm3p/json/value.h>
#include "cmJSONState.h"
#include "cmUVProcessChain.h"
#include "cmUVStream.h"
@@ -25,10 +25,11 @@ cm::optional<Json::Value> cmParsePlist(std::string const& filename)
return cm::nullopt;
}
Json::Reader reader;
Json::Value value;
cmUVIStream outputStream(chain.OutputStream());
if (!reader.parse(outputStream, value)) {
cmJSONState parseState(outputStream, &value,
cmJSONState::StrictMode::Relaxed);
if (!parseState.errors.empty()) {
return cm::nullopt;
}
return cm::optional<Json::Value>(value);