diff options
author | Brad King <brad.king@kitware.com> | 2015-01-15 14:53:47 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-15 14:53:47 (GMT) |
commit | 101a62aacbcc812263439ca42faaf4f2419b6119 (patch) | |
tree | edde32775335da2b100dc24fff5c4698d261e3c9 /Modules/Compiler | |
parent | 23c02d245425ab15d6d0a99941355488ddee8cf5 (diff) | |
parent | 4ce110bbbac36362d8f3fbddb0b405320695ed36 (diff) | |
download | CMake-101a62aacbcc812263439ca42faaf4f2419b6119.zip CMake-101a62aacbcc812263439ca42faaf4f2419b6119.tar.gz CMake-101a62aacbcc812263439ca42faaf4f2419b6119.tar.bz2 |
Merge topic 'revert-feature_record_msvc'
4ce110bb Tests: Revert workaround for COMPILE_FEATURES genex bug
0b7e7e27 Revert topic 'feature_record_msvc'
Diffstat (limited to 'Modules/Compiler')
-rw-r--r-- | Modules/Compiler/MSVC-C-FeatureTests.cmake | 23 | ||||
-rw-r--r-- | Modules/Compiler/MSVC-CXX-FeatureTests.cmake | 97 |
2 files changed, 0 insertions, 120 deletions
diff --git a/Modules/Compiler/MSVC-C-FeatureTests.cmake b/Modules/Compiler/MSVC-C-FeatureTests.cmake deleted file mode 100644 index e449358..0000000 --- a/Modules/Compiler/MSVC-C-FeatureTests.cmake +++ /dev/null @@ -1,23 +0,0 @@ - -# Reference: http://msdn.microsoft.com/en-us/library/vstudio/hh567368.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://www.visualstudio.com/en-us/news/vs2015-preview-vs.aspx - -set(_cmake_oldestSupported "_MSC_VER >= 1300") - -set(MSVC_2010 "_MSC_VER >= 1600") -set(_cmake_feature_test_c_static_assert "${MSVC_2010}") -set(_cmake_feature_test_c_variadic_macros "${MSVC_2010}") - -set(MSVC_2003 "_MSC_VER >= 1300") -set(_cmake_feature_test_c_function_prototypes "${MSVC_2003}") - -# Currently unsupported: -# restrict requires the __restrict syntax in msvc -# set(_cmake_feature_test_c_restrict) - -# Unset all the variables that we don't need exposed. -# _cmake_oldestSupported is required by WriteCompilerDetectionHeader -set(MSVC_2010) -set(MSVC_2003)
\ No newline at end of file diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake deleted file mode 100644 index b238fde..0000000 --- a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake +++ /dev/null @@ -1,97 +0,0 @@ - -# Reference: http://msdn.microsoft.com/en-us/library/vstudio/hh567368.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://www.visualstudio.com/en-us/news/vs2015-preview-vs.aspx - - -set(_cmake_oldestSupported "_MSC_VER >= 1600") - -set(MSVC_2015 "_MSC_VER >= 1900") -set(_cmake_feature_test_cxx_alignas "${MSVC_2015}") -set(_cmake_feature_test_cxx_alignof "${MSVC_2015}") -set(_cmake_feature_test_cxx_binary_literals "${MSVC_2015}") -set(_cmake_feature_test_cxx_decltype_auto "${MSVC_2015}") -set(_cmake_feature_test_cxx_digit_separators "${MSVC_2015}") -set(_cmake_feature_test_cxx_func_identifier "${MSVC_2015}") -# http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx -# Note 1. While previous version of VisualStudio said they supported this -# they silently produced bad code, and are now marked as having partial -# support -set(_cmake_feature_test_cxx_generalized_initializers "${MSVC_2015}") -set(_cmake_feature_test_cxx_generic_lambdas "${MSVC_2015}") -set(_cmake_feature_test_cxx_inheriting_constructors "${MSVC_2015}") -set(_cmake_feature_test_cxx_inline_namespaces "${MSVC_2015}") -set(_cmake_feature_test_cxx_lambda_init_captures "${MSVC_2015}") -set(_cmake_feature_test_cxx_noexcept "${MSVC_2015}") -set(_cmake_feature_test_cxx_return_type_deduction "${MSVC_2015}") -set(_cmake_feature_test_cxx_sizeof_member "${MSVC_2015}") -set(_cmake_feature_test_cxx_thread_local "${MSVC_2015}") -set(_cmake_feature_test_cxx_unicode_literals "${MSVC_2015}") -set(_cmake_feature_test_cxx_unrestricted_unions "${MSVC_2015}") -set(_cmake_feature_test_cxx_user_literals "${MSVC_2015}") - -set(MSVC_2013 "_MSC_VER >= 1800") -set(_cmake_feature_test_cxx_alias_templates "${MSVC_2013}") -set(_cmake_feature_test_cxx_default_function_template_args "${MSVC_2013}") -set(_cmake_feature_test_cxx_defaulted_functions "${MSVC_2013}") -set(_cmake_feature_test_cxx_delegating_constructors "${MSVC_2013}") -set(_cmake_feature_test_cxx_deleted_functions "${MSVC_2013}") -set(_cmake_feature_test_cxx_explicit_conversions "${MSVC_2013}") -set(_cmake_feature_test_cxx_nonstatic_member_init "${MSVC_2013}") -set(_cmake_feature_test_cxx_raw_string_literals "${MSVC_2013}") -set(_cmake_feature_test_cxx_uniform_initialization "${MSVC_2013}") -# Possibly broken: -# http://thread.gmane.org/gmane.comp.lib.boost.devel/244986/focus=245333 -set(_cmake_feature_test_cxx_variadic_templates "${MSVC_2013}") -# Microsoft now states they support contextual conversions -# see footnote 6 at: -# http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx -set(_cmake_feature_test_cxx_contextual_conversions "${MSVC_2013}") - -set(MSVC_2012 "_MSC_VER >= 1700") -set(_cmake_feature_test_cxx_decltype_incomplete_return_types "${MSVC_2012}") -set(_cmake_feature_test_cxx_enum_forward_declarations "${MSVC_2012}") -set(_cmake_feature_test_cxx_final "${MSVC_2012}") -set(_cmake_feature_test_cxx_range_for "${MSVC_2012}") -set(_cmake_feature_test_cxx_strong_enums "${MSVC_2012}") - -set(MSVC_2010 "_MSC_VER >= 1600") -set(_cmake_feature_test_cxx_auto_function "${MSVC_2010}") -set(_cmake_feature_test_cxx_auto_type "${MSVC_2010}") -set(_cmake_feature_test_cxx_decltype "${MSVC_2010}") -set(_cmake_feature_test_cxx_extended_friend_declarations "${MSVC_2010}") -set(_cmake_feature_test_cxx_extern_templates "${MSVC_2010}") -set(_cmake_feature_test_cxx_lambdas "${MSVC_2010}") -set(_cmake_feature_test_cxx_local_type_template_args "${MSVC_2010}") -set(_cmake_feature_test_cxx_long_long_type "${MSVC_2010}") -set(_cmake_feature_test_cxx_nullptr "${MSVC_2010}") -set(_cmake_feature_test_cxx_override "${MSVC_2010}") -set(_cmake_feature_test_cxx_right_angle_brackets "${MSVC_2010}") -set(_cmake_feature_test_cxx_rvalue_references "${MSVC_2010}") -set(_cmake_feature_test_cxx_static_assert "${MSVC_2010}") -set(_cmake_feature_test_cxx_template_template_parameters "${MSVC_2010}") -set(_cmake_feature_test_cxx_trailing_return_types "${MSVC_2010}") -set(_cmake_feature_test_cxx_variadic_macros "${MSVC_2010}") - -# Currently unsupported: -# http://herbsutter.com/2013/11/18/visual-c-compiler-november-2013-ctp/ -# http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx - -# set(_cmake_feature_test_cxx_reference_qualified_functions ) -# set(_cmake_feature_test_cxx_constexpr ) -# set(_cmake_feature_test_cxx_attributes ) -# set(_cmake_feature_test_cxx_aggregate_default_initializers ) -# set(_cmake_feature_test_cxx_attribute_deprecated ) -# set(_cmake_feature_test_cxx_defaulted_move_initializers ) -# set(_cmake_feature_test_cxx_nonstatic_member_init ) -# set(_cmake_feature_test_cxx_relaxed_constexpr ) -# set(_cmake_feature_test_cxx_variable_templates ) - - -# Unset all the variables that we don't need exposed. -# _cmake_oldestSupported is required by WriteCompilerDetectionHeader -set(MSVC_2015) -set(MSVC_2013) -set(MSVC_2012) -set(MSVC_2010) |