summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-04-28 17:05:03 (GMT)
committerBrad King <brad.king@kitware.com>2016-04-28 17:05:52 (GMT)
commitd2a061596ef674e8268b98175597a9253f07f6ef (patch)
treeccee26a5db601e4f027e21182c0f39bf36b36941
parent5b4f771fd7eb02f4bb5248194796d191347e492b (diff)
downloadCMake-d2a061596ef674e8268b98175597a9253f07f6ef.zip
CMake-d2a061596ef674e8268b98175597a9253f07f6ef.tar.gz
CMake-d2a061596ef674e8268b98175597a9253f07f6ef.tar.bz2
Features: Record features for VS 2015 Update 2
-rw-r--r--Modules/Compiler/MSVC-CXX-FeatureTests.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
index ad1d14b..79d5962 100644
--- a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -9,6 +9,10 @@
set(_cmake_oldestSupported "_MSC_VER >= 1600")
+# 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")
+
set(MSVC_2015 "_MSC_VER >= 1900")
set(_cmake_feature_test_cxx_alignas "${MSVC_2015}")
set(_cmake_feature_test_cxx_alignof "${MSVC_2015}")
@@ -95,7 +99,6 @@ set(_cmake_feature_test_cxx_variadic_macros "${MSVC_2010}")
# set(_cmake_feature_test_cxx_relaxed_constexpr )
# 'NSDMIs for aggregates'
# set(_cmake_feature_test_cxx_aggregate_default_initializers )
-# set(_cmake_feature_test_cxx_variable_templates )
# In theory decltype incomplete return types was added in 2012
# but without support for decltype_auto and return type deduction this