diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-29 17:28:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-04-29 17:28:36 (GMT) |
| commit | 22e04bfe32cdeabf6a01114a5ede724f3e157d5a (patch) | |
| tree | 769c5927d78485b7c03fee202c6a36f27b3158cc | |
| parent | 9d2e306e98cb2a6e644b668dd85914b2a1e0666c (diff) | |
| parent | d2a061596ef674e8268b98175597a9253f07f6ef (diff) | |
| download | CMake-22e04bfe32cdeabf6a01114a5ede724f3e157d5a.zip CMake-22e04bfe32cdeabf6a01114a5ede724f3e157d5a.tar.gz CMake-22e04bfe32cdeabf6a01114a5ede724f3e157d5a.tar.bz2 | |
Merge topic 'vs-2015-update-2-features'
d2a06159 Features: Record features for VS 2015 Update 2
| -rw-r--r-- | Modules/Compiler/MSVC-CXX-FeatureTests.cmake | 5 |
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 |