summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-07-30 15:05:04 (GMT)
committerBrad King <brad.king@kitware.com>2019-07-30 15:17:28 (GMT)
commitf9b7c660d700ffa2166b80333bfd89f96fbfb186 (patch)
tree55dd5035668a38c969160dcd55b5b9cb5648152c /Tests/RunCMake/VS10Project/RunCMakeTest.cmake
parentf43a7d76c737c5bb9b903a2b1be5186c081ec21e (diff)
downloadCMake-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 'Tests/RunCMake/VS10Project/RunCMakeTest.cmake')
-rw-r--r--Tests/RunCMake/VS10Project/RunCMakeTest.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
index 55ca9ea..27b81b7 100644
--- a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
+++ b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
@@ -26,3 +26,7 @@ run_cmake(VsPackageReferences)
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.05)
run_cmake(VsJustMyCode)
endif()
+
+if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.20)
+ run_cmake(VsSpectreMitigation)
+endif()