summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-08 09:36:54 -0400
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-08 09:36:54 -0400
commit988b3806b6ad2f28ebd6b582ce18928407d0b011 (patch)
tree8445c3bf6d14c67665ee12e0da325b0756665c13 /Modules
parent04657ee2f83cb446c5595090f256273a23be94a2 (diff)
parentbdc679a8aee4e6b9a8aea795bdbda2341d1e5d08 (diff)
downloadcmake-988b3806b6ad2f28ebd6b582ce18928407d0b011.tar.gz
Merge topic 'vs-15-generator'
bdc679a8 VS15: Add Visual Studio 15 generator a8936656 VS: Update v140 flag tables from VS 15 MSBuild files 21346d3f Features: Record features for VS 15 Preview 4
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Compiler/MSVC-CXX-FeatureTests.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
index 79d5962bb1..596958668f 100644
--- a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -9,6 +9,9 @@
set(_cmake_oldestSupported "_MSC_VER >= 1600")
+# VS version 15 (not 2015) introduces support for aggregate initializers.
+set(_cmake_feature_test_cxx_aggregate_default_initializers "_MSC_FULL_VER >= 190024406")
+
# VS 2015 Update 2 introduces support for variable templates.
# https://www.visualstudio.com/en-us/news/vs2015-update2-vs.aspx
set(_cmake_feature_test_cxx_variable_templates "_MSC_FULL_VER >= 190023918")