diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/MSVC-C-FeatureTests.cmake | 23 | ||||
| -rw-r--r-- | Modules/Compiler/MSVC-CXX-FeatureTests.cmake | 97 | ||||
| -rw-r--r-- | Modules/Platform/Windows-MSVC-C.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Windows-MSVC-CXX.cmake | 9 | ||||
| -rw-r--r-- | Modules/WriteCompilerDetectionHeader.cmake | 5 |
5 files changed, 2 insertions, 134 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) diff --git a/Modules/Platform/Windows-MSVC-C.cmake b/Modules/Platform/Windows-MSVC-C.cmake index c7792eb..cbe1586 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 ad56f68..0e85005 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 bcaaafa..36b9706 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) |