summaryrefslogtreecommitdiffstats
path: root/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
diff options
context:
space:
mode:
authorRobert Maynard <robert.maynard@kitware.com>2019-05-07 17:20:21 (GMT)
committerBrad King <brad.king@kitware.com>2019-05-13 17:11:32 (GMT)
commit1ebb0d79fe1330eea4b044bcfd9b613db8bfe86b (patch)
tree4548638363b1a5ec93322d1b55ef5210ed69599b /Modules/Compiler/MSVC-CXX-FeatureTests.cmake
parent4aace9b015cd95209c191139b091acbe0c047864 (diff)
downloadCMake-1ebb0d79fe1330eea4b044bcfd9b613db8bfe86b.zip
CMake-1ebb0d79fe1330eea4b044bcfd9b613db8bfe86b.tar.gz
CMake-1ebb0d79fe1330eea4b044bcfd9b613db8bfe86b.tar.bz2
CompileFeatures: Relax cxx_relaxed_constexpr compiler requirements
This in effect means that cxx_relaxed_constexpr is now supported by MSVC and Intel 18.0-18.04.
Diffstat (limited to 'Modules/Compiler/MSVC-CXX-FeatureTests.cmake')
-rw-r--r--Modules/Compiler/MSVC-CXX-FeatureTests.cmake6
1 files changed, 2 insertions, 4 deletions
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
index 9c604f2..125974a 100644
--- a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -9,10 +9,8 @@ set(_cmake_oldestSupported "_MSC_VER >= 1600")
# https://docs.microsoft.com/en-us/cpp/cpp-conformance-improvements-2017#update_153
set(_cmake_feature_test_cxx_decltype_incomplete_return_types "_MSC_VER >= 1911")
-set(MSVC_2017 "_MSC_VER >= 1910")
-# VS 2017 introduces support for "N3652 Extended constexpr"
-# but as of v15.6 there are still bugs in the implementation
-#set(_cmake_feature_test_cxx_relaxed_constexpr "${MSVC_2017}")
+# VS 2017 v15.3 fixes support for "N3652 Extended constexpr"
+set(_cmake_feature_test_cxx_relaxed_constexpr "_MSC_VER >= 1911")
# VS 2017 Preview introduces support for aggregate initializers.
set(_cmake_feature_test_cxx_aggregate_default_initializers "_MSC_FULL_VER >= 190024406")