diff options
author | Brad King <brad.king@kitware.com> | 2019-07-30 15:05:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-07-30 15:17:28 (GMT) |
commit | f9b7c660d700ffa2166b80333bfd89f96fbfb186 (patch) | |
tree | 55dd5035668a38c969160dcd55b5b9cb5648152c /Source/cmVisualStudio10TargetGenerator.h | |
parent | f43a7d76c737c5bb9b903a2b1be5186c081ec21e (diff) | |
download | CMake-f9b7c660d700ffa2166b80333bfd89f96fbfb186.zip CMake-f9b7c660d700ffa2166b80333bfd89f96fbfb186.tar.gz CMake-f9b7c660d700ffa2166b80333bfd89f96fbfb186.tar.bz2 |
VS: Fix mapping of `-Qspectre-` flag
The mapping for this flag was added by commit 43aa632f57 (VS: Populate
`-Qspectre-` flag table entry for v142, 2019-01-24, v3.14.0-rc1~74^2~7).
However, it did not do anything because the special logic added by
commit bb60ed6e72 (VS: Add flag table entry for -Qspectre, 2018-10-08,
v3.13.0-rc1~4^2) to move the `SpectreMitigation` element from
`ClCompile` to the top level only handled the presence of the setting
and not its value. Extend the special logic to carry the value too.
Fixes: #19535
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.h')
-rw-r--r-- | Source/cmVisualStudio10TargetGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h index 860b809..6607e77 100644 --- a/Source/cmVisualStudio10TargetGenerator.h +++ b/Source/cmVisualStudio10TargetGenerator.h @@ -215,7 +215,7 @@ private: unsigned int NsightTegraVersion[4]; bool TargetCompileAsWinRT; std::set<std::string> IPOEnabledConfigurations; - std::set<std::string> SpectreMitigationConfigurations; + std::map<std::string, std::string> SpectreMitigation; cmGlobalVisualStudio10Generator* const GlobalGenerator; cmLocalVisualStudio10Generator* const LocalGenerator; std::set<std::string> CSharpCustomCommandNames; |