diff --git a/Help/release/dev/feature_record_msvc.rst b/Help/release/dev/feature_record_msvc.rst deleted file mode 100644 index 63b642db4..000000000 --- a/Help/release/dev/feature_record_msvc.rst +++ /dev/null @@ -1,6 +0,0 @@ -feature_record_msvc -------------------- - -* The :manual:`Compile Features ` functionality - is now aware of features supported by Visual Studio 2010 and above - (``MSVC``). diff --git a/Modules/Compiler/MSVC-C-FeatureTests.cmake b/Modules/Compiler/MSVC-C-FeatureTests.cmake deleted file mode 100644 index e44935807..000000000 --- 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 b238fdefd..000000000 --- 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) diff --git a/Modules/Platform/Windows-MSVC-C.cmake b/Modules/Platform/Windows-MSVC-C.cmake index c7792eb80..cbe1586e1 100644 --- a/Modules/Platform/Windows-MSVC-C.cmake +++ b/Modules/Platform/Windows-MSVC-C.cmake @@ -3,5 +3,3 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 18.0) set(_FS_C " /FS") endif() __windows_compiler_msvc(C) - -set(CMAKE_C_STANDARD_DEFAULT 90) diff --git a/Modules/Platform/Windows-MSVC-CXX.cmake b/Modules/Platform/Windows-MSVC-CXX.cmake index ad56f68a4..0e8500532 100644 --- a/Modules/Platform/Windows-MSVC-CXX.cmake +++ b/Modules/Platform/Windows-MSVC-CXX.cmake @@ -4,12 +4,3 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0) set(_FS_CXX " /FS") endif() __windows_compiler_msvc(CXX) - -# No version of MSVC has full conformance to C++11. Therefore the -# __cplusplus macro always evaluates to 98 even if the compilers come with -# C++11/14/+ features enabled. -set(CMAKE_CXX_STANDARD_DEFAULT 98) - -macro(cmake_record_cxx_compile_features) - record_compiler_features(CXX "" CMAKE_CXX_COMPILE_FEATURES) -endmacro() diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake index bcaaafa12..36b9706e0 100644 --- a/Modules/WriteCompilerDetectionHeader.cmake +++ b/Modules/WriteCompilerDetectionHeader.cmake @@ -36,7 +36,7 @@ # PREFIX ClimbingStats # OUTPUT_FILES_VAR support_files # OUTPUT_DIR compilers -# COMPILERS GNU Clang MSVC +# COMPILERS GNU Clang # FEATURES cxx_variadic_templates # ) # install(FILES @@ -100,7 +100,7 @@ # write_compiler_detection_header( # FILE climbingstats_compiler_detection.h # PREFIX ClimbingStats -# COMPILERS GNU Clang AppleClang MSVC +# COMPILERS GNU Clang AppleClang # FEATURES cxx_variadic_templates # ) # @@ -316,7 +316,6 @@ function(write_compiler_detection_header GNU Clang AppleClang - MSVC ) set(_hex_compilers ADSP Borland Embarcadero SunPro) diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt index 9fb8d1bc0..b164f06c0 100644 --- a/Tests/CompileFeatures/CMakeLists.txt +++ b/Tests/CompileFeatures/CMakeLists.txt @@ -26,18 +26,7 @@ get_property(c_features GLOBAL PROPERTY CMAKE_C_KNOWN_FEATURES) foreach(feature ${c_features}) run_test(${feature} C) endforeach() - get_property(cxx_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES) - -if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - list(REMOVE_ITEM cxx_features - # This test requires auto return type deduction to work properly, but - # that is not supported by all versions of MSVC that support decltype - # incomplete return types. - cxx_decltype_incomplete_return_types - ) -endif() - foreach(feature ${cxx_features}) run_test(${feature} CXX) endforeach() @@ -64,17 +53,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" ) endif() -set(MSVC_) -if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND - MSVC_VERSION LESS 1800) - list(REMOVE_ITEM CXX_non_features - # Microsoft only officially supports this feature in VS2013 and above, due - # to new wording of the proposal. We don't test for this with MSVC because - # older compiler pass the test but might not actually conform - cxx_contextual_conversions - ) -endif() - set(C_ext c) set(C_standard_flag 11) set(CXX_ext cpp) @@ -148,7 +126,6 @@ if (CMAKE_CXX_COMPILE_FEATURES) add_executable(CompileFeaturesGenex genex_test.cpp) set_property(TARGET CompileFeaturesGenex PROPERTY CXX_STANDARD 11) - target_compile_definitions(CompileFeaturesGenex PRIVATE HAVE_OVERRIDE_CONTROL=$ HAVE_NULLPTR=$ diff --git a/Tests/CompileFeatures/genex_test.cpp b/Tests/CompileFeatures/genex_test.cpp index 4412569ce..f667cc498 100644 --- a/Tests/CompileFeatures/genex_test.cpp +++ b/Tests/CompileFeatures/genex_test.cpp @@ -10,7 +10,7 @@ struct A virtual int getA() { return 7; } }; -struct B : A +struct B final : A { int getA() override { return 42; } }; diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt index cfaa78c55..401de9581 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt +++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt @@ -11,7 +11,7 @@ get_property(c_known_features GLOBAL PROPERTY CMAKE_C_KNOWN_FEATURES) write_compiler_detection_header( FILE "${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h" PREFIX TEST - COMPILERS GNU Clang AppleClang MSVC + COMPILERS GNU Clang AppleClang VERSION 3.1 PROLOG "// something" EPILOG "// more" @@ -64,18 +64,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES) endif() -# for msvc the compiler version determines which c++11 features are available. -# Both variadic templates and delegating constructors support exist in -# all versions that we write compile headers for. -if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND - ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_delegating_constructors;") - list(APPEND true_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS) - list(APPEND true_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES) -else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - list(APPEND false_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS) - list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES) -endif() - if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") @@ -93,7 +81,7 @@ write_compiler_detection_header( PREFIX MULTI OUTPUT_FILES_VAR multi_files OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/compiler_support" - COMPILERS GNU Clang AppleClang MSVC + COMPILERS GNU Clang AppleClang VERSION 3.1 FEATURES ${cxx_known_features} ${c_known_features} diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake index 3b3709130..1892a5cf4 100644 --- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake +++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake @@ -27,13 +27,8 @@ if (NOT CXX_FEATURES) run_cmake(NoSupportedCxxFeatures) run_cmake(NoSupportedCxxFeaturesGenex) else() - # compilers such as MSVC have no explicit flags to enable c++11 mode. - # Instead they come with all c++11 features implicitly enabled. - # So for those types of compilers this tests is not applicable. - if(CMAKE_CXX11_STANDARD_COMPILE_OPTION) - run_cmake(LinkImplementationFeatureCycle) - run_cmake(LinkImplementationFeatureCycleSolved) - endif() + run_cmake(LinkImplementationFeatureCycle) + run_cmake(LinkImplementationFeatureCycleSolved) if (";${CXX_FEATURES};" MATCHES ";cxx_final;") set(RunCMake_TEST_OPTIONS "-DHAVE_FINAL=1")