|
|
@@ -1315,7 +1315,10 @@ static unsigned int cmLoadFlagTableSpecial(Json::Value entry,
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
-cmIDEFlagTable const* cmLoadFlagTableJson(std::string const& flagJsonPath)
|
|
|
+unsigned long long const vsVer16_10_0 = 4503644629696790;
|
|
|
+
|
|
|
+cmIDEFlagTable const* cmLoadFlagTableJson(
|
|
|
+ std::string const& flagJsonPath, cm::optional<unsigned long long> vsver)
|
|
|
{
|
|
|
cmIDEFlagTable* ret = nullptr;
|
|
|
auto savedFlagIterator = loadedFlagJsonFiles.find(flagJsonPath);
|
|
|
@@ -1337,6 +1340,11 @@ cmIDEFlagTable const* cmLoadFlagTableJson(std::string const& flagJsonPath)
|
|
|
flagEntry.comment = cmLoadFlagTableString(flag, "comment");
|
|
|
flagEntry.value = cmLoadFlagTableString(flag, "value");
|
|
|
flagEntry.special = cmLoadFlagTableSpecial(flag, "flags");
|
|
|
+ // FIXME: Port this version check to a Json field.
|
|
|
+ if (vsver && *vsver < vsVer16_10_0 &&
|
|
|
+ flagEntry.IDEName == "ExternalWarningLevel") {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
flagTable.push_back(flagEntry);
|
|
|
}
|
|
|
cmIDEFlagTable endFlag{ "", "", "", "", 0 };
|
|
|
@@ -1364,17 +1372,19 @@ cmIDEFlagTable const* cmGlobalVisualStudio10Generator::LoadFlagTable(
|
|
|
{
|
|
|
cmIDEFlagTable const* ret = nullptr;
|
|
|
|
|
|
+ cm::optional<unsigned long long> vsver = this->GetVSInstanceVersion();
|
|
|
+
|
|
|
std::string filename;
|
|
|
if (!optionsName.empty()) {
|
|
|
filename = cmGetFlagTableName(optionsName, table);
|
|
|
- ret = cmLoadFlagTableJson(filename);
|
|
|
+ ret = cmLoadFlagTableJson(filename, vsver);
|
|
|
} else {
|
|
|
filename = cmGetFlagTableName(toolsetName, table);
|
|
|
if (cmSystemTools::FileExists(filename)) {
|
|
|
- ret = cmLoadFlagTableJson(filename);
|
|
|
+ ret = cmLoadFlagTableJson(filename, vsver);
|
|
|
} else {
|
|
|
filename = cmGetFlagTableName(defaultName, table);
|
|
|
- ret = cmLoadFlagTableJson(filename);
|
|
|
+ ret = cmLoadFlagTableJson(filename, vsver);
|
|
|
}
|
|
|
}
|
|
|
|