summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-10-08 17:51:29 (GMT)
committerBrad King <brad.king@kitware.com>2018-10-08 18:03:39 (GMT)
commitbb60ed6e724b2891a33f3cd5b6e5aa300dcc4180 (patch)
tree815be526387f22f1492391446521a66c11ab919a /Source/cmVisualStudio10TargetGenerator.cxx
parentfd02538974dd952a8639d371c2c0067d30d5469a (diff)
downloadCMake-bb60ed6e724b2891a33f3cd5b6e5aa300dcc4180.zip
CMake-bb60ed6e724b2891a33f3cd5b6e5aa300dcc4180.tar.gz
CMake-bb60ed6e724b2891a33f3cd5b6e5aa300dcc4180.tar.bz2
VS: Add flag table entry for -Qspectre
Add special logic to map this flag to a top-level build setting instead of being in ClCompile. Fixes: #18426
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 16eca96..57d66e0 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1125,6 +1125,9 @@ void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValues(
if (this->IPOEnabledConfigurations.count(config) > 0) {
e1.Element("WholeProgramOptimization", "true");
}
+ if (this->SpectreMitigationConfigurations.count(config) > 0) {
+ e1.Element("SpectreMitigation", "Spectre");
+ }
}
void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValuesManaged(
@@ -2625,6 +2628,11 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
}
}
+ if (clOptions.HasFlag("SpectreMitigation")) {
+ this->SpectreMitigationConfigurations.insert(configName);
+ clOptions.RemoveFlag("SpectreMitigation");
+ }
+
this->ClOptions[configName] = std::move(pOptions);
return true;
}