kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'vs-compiler-feature-2015-update' into release

This commit is contained in:
Brad King 2015-07-22 08:35:46 -04:00
parent a398acd02f c2d590c957
commit b9fba34592
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/Compiler/MSVC-CXX-FeatureTests.cmake
View File

@ -3,6 +3,8 @@
# http://blogs.msdn.com/b/vcblog/archive/2013/06/28/c-11-14-stl-features-fixes-and-breaking-changes-in-vs-2013.aspx # http://blogs.msdn.com/b/vcblog/archive/2013/06/28/c-11-14-stl-features-fixes-and-breaking-changes-in-vs-2013.aspx
# http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx # http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx
# http://www.visualstudio.com/en-us/news/vs2015-preview-vs.aspx # http://www.visualstudio.com/en-us/news/vs2015-preview-vs.aspx
# http://blogs.msdn.com/b/vcblog/archive/2015/04/29/c-11-14-17-features-in-vs-2015-rc.aspx
# http://blogs.msdn.com/b/vcblog/archive/2015/06/19/c-11-14-17-features-in-vs-2015-rtm.aspx
set(_cmake_oldestSupported "_MSC_VER >= 1600") set(_cmake_oldestSupported "_MSC_VER >= 1600")
@ -10,10 +12,11 @@ set(_cmake_oldestSupported "_MSC_VER >= 1600")
set(MSVC_2015 "_MSC_VER >= 1900") set(MSVC_2015 "_MSC_VER >= 1900")
set(_cmake_feature_test_cxx_alignas "${MSVC_2015}") set(_cmake_feature_test_cxx_alignas "${MSVC_2015}")
set(_cmake_feature_test_cxx_alignof "${MSVC_2015}") set(_cmake_feature_test_cxx_alignof "${MSVC_2015}")
set(_cmake_feature_test_cxx_attributes "${MSVC_2015}")
set(_cmake_feature_test_cxx_attribute_deprecated "${MSVC_2015}")
set(_cmake_feature_test_cxx_binary_literals "${MSVC_2015}") set(_cmake_feature_test_cxx_binary_literals "${MSVC_2015}")
set(_cmake_feature_test_cxx_constexpr "${MSVC_2015}")
set(_cmake_feature_test_cxx_decltype_auto "${MSVC_2015}") set(_cmake_feature_test_cxx_decltype_auto "${MSVC_2015}")
# Digit separators are not available as of VS 2015 Preview, but a footnote
# says they will be available in the RTM.
set(_cmake_feature_test_cxx_digit_separators "${MSVC_2015}") set(_cmake_feature_test_cxx_digit_separators "${MSVC_2015}")
set(_cmake_feature_test_cxx_func_identifier "${MSVC_2015}") set(_cmake_feature_test_cxx_func_identifier "${MSVC_2015}")
set(_cmake_feature_test_cxx_nonstatic_member_init "${MSVC_2015}") set(_cmake_feature_test_cxx_nonstatic_member_init "${MSVC_2015}")
@ -89,10 +92,7 @@ set(_cmake_feature_test_cxx_trailing_return_types "${MSVC_2010}")
set(_cmake_feature_test_cxx_variadic_macros "${MSVC_2010}") set(_cmake_feature_test_cxx_variadic_macros "${MSVC_2010}")
# Currently unsupported: # Currently unsupported:
# set(_cmake_feature_test_cxx_constexpr )
# set(_cmake_feature_test_cxx_relaxed_constexpr ) # set(_cmake_feature_test_cxx_relaxed_constexpr )
# set(_cmake_feature_test_cxx_attributes )
# set(_cmake_feature_test_cxx_attribute_deprecated )
# 'NSDMIs for aggregates' # 'NSDMIs for aggregates'
# set(_cmake_feature_test_cxx_aggregate_default_initializers ) # set(_cmake_feature_test_cxx_aggregate_default_initializers )
# set(_cmake_feature_test_cxx_variable_templates ) # set(_cmake_feature_test_cxx_variable_templates )

6
Tests/CompileFeatures/CMakeLists.txt
View File

@ -116,12 +116,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
cxx_deleted_functions cxx_deleted_functions
cxx_nonstatic_member_init cxx_nonstatic_member_init
) )
else()
list(REMOVE_ITEM CXX_non_features
# The cxx_constexpr feature happens to work (for *this* testcase)
# with VS 2015, but they document only partial support.
cxx_constexpr
)
endif() endif()
endif() endif()