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

VS: Use cmJSONState to read flag table

Browse Source 
This approach will be more portable.
This commit is contained in:
Tyler Yankee
2026-08-12 16:56:55 -04:00
parent aadc9b938c
commit e2da85c672
1 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalVisualStudio10Generator.cxx
+26 -30
View File
@@ -11,7 +11,6 @@
#include <cm/memory>
#include <cmext/string_view>
#include <cm3p/json/reader.h>
#include <cm3p/json/value.h>
#include "cmsys/FStream.hxx"
@@ -24,6 +23,7 @@
#include "cmGlobalVisualStudio7Generator.h"
#include "cmGlobalVisualStudioGenerator.h"
#include "cmIDEFlagTable.h"
#include "cmJSONState.h"
#include "cmLocalGenerator.h"
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
@@ -1379,39 +1379,35 @@ cmIDEFlagTable const* cmLoadFlagTableJson(std::string const& flagJsonPath,
if (savedFlagIterator != loadedFlagJsonFiles.end()) {
ret = savedFlagIterator->second.data();
} else {
Json::Reader reader;
cmsys::ifstream stream;
stream.open(flagJsonPath.c_str(), std::ios_base::in);
if (stream) {
Json::Value flags;
if (reader.parse(stream, flags, false) && flags.isArray()) {
std::vector<cmIDEFlagTable> flagTable;
for (auto const& flag : flags) {
Json::Value const& vsminJson = flag["vsmin"];
if (vsminJson.isString()) {
std::string const& vsmin = vsminJson.asString();
if (!vsmin.empty()) {
if (!vsVer ||
cmSystemTools::VersionCompareGreater(vsmin, *vsVer)) {
continue;
}
Json::Value flags;
cmJSONState parseState(flagJsonPath, &flags,
cmJSONState::StrictMode::Relaxed);
if (parseState.errors.empty() && flags.isArray()) {
std::vector<cmIDEFlagTable> flagTable;
for (auto const& flag : flags) {
Json::Value const& vsminJson = flag["vsmin"];
if (vsminJson.isString()) {
std::string const& vsmin = vsminJson.asString();
if (!vsmin.empty()) {
if (!vsVer ||
cmSystemTools::VersionCompareGreater(vsmin, *vsVer)) {
continue;
}
}
cmIDEFlagTable flagEntry;
flagEntry.IDEName = cmLoadFlagTableString(flag, "name");
flagEntry.commandFlag = cmLoadFlagTableString(flag, "switch");
flagEntry.comment = cmLoadFlagTableString(flag, "comment");
flagEntry.value = cmLoadFlagTableString(flag, "value");
flagEntry.special = cmLoadFlagTableSpecial(flag, "flags");
flagTable.push_back(flagEntry);
}
cmIDEFlagTable endFlag{ "", "", "", "", 0 };
flagTable.push_back(endFlag);
loadedFlagJsonFiles[flagJsonPath] = flagTable;
ret = loadedFlagJsonFiles[flagJsonPath].data();
cmIDEFlagTable flagEntry;
flagEntry.IDEName = cmLoadFlagTableString(flag, "name");
flagEntry.commandFlag = cmLoadFlagTableString(flag, "switch");
flagEntry.comment = cmLoadFlagTableString(flag, "comment");
flagEntry.value = cmLoadFlagTableString(flag, "value");
flagEntry.special = cmLoadFlagTableSpecial(flag, "flags");
flagTable.push_back(flagEntry);
}
cmIDEFlagTable endFlag{ "", "", "", "", 0 };
flagTable.push_back(endFlag);
loadedFlagJsonFiles[flagJsonPath] = flagTable;
ret = loadedFlagJsonFiles[flagJsonPath].data();
}
}
return ret;