diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2016-04-27 19:28:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-28 13:16:31 (GMT) |
| commit | d028b948721d7a6042b87e238542a11fea78edb0 (patch) | |
| tree | f2775d0dab4f39f27912517858bc19ca9673b75c /Modules/Compiler | |
| parent | be910f00b580addcf60f33c6f6c0625dba505ef8 (diff) | |
| download | CMake-d028b948721d7a6042b87e238542a11fea78edb0.zip CMake-d028b948721d7a6042b87e238542a11fea78edb0.tar.gz CMake-d028b948721d7a6042b87e238542a11fea78edb0.tar.bz2 | |
Features: Specify minimum version Intel C++ 12.1
Versions below 12.1 do not provide enough information to properly detect
if compiling with c++98 or c++0x enabled so remove them from the
supported list.
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/Intel-CXX-FeatureTests.cmake | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake index d328e3c..e111c07 100644 --- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake +++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake @@ -12,7 +12,7 @@ endif() #set(_cmake_feature_test_cxx_variable_templates "${Intel15_CXX14}") #set(_cmake_feature_test_cxx_relaxed_constexpr "${Intel15_CXX14}") -set(_cmake_oldestSupported "__INTEL_COMPILER >= 1110") +set(_cmake_oldestSupported "__INTEL_COMPILER >= 1210") set(DETECT_CXX11 "((__cplusplus >= 201103L) || defined(__INTEL_CXX11_MODE__) || defined(__GXX_EXPERIMENTAL_CXX0X__))") #ICC version 15 update 1 has a bug where __cplusplus is defined as 1 no matter #if you are compiling as 98/11/14. So to properly detect C++14 with this version @@ -71,30 +71,26 @@ set(_cmake_feature_test_cxx_range_for "${Intel13_CXX11}") # Cannot find Intel documentation for N2640: cxx_uniform_initialization set(_cmake_feature_test_cxx_uniform_initialization "${Intel13_CXX11}") -set(Intel121_CXX11 "__INTEL_COMPILER >= 1210 && ${DETECT_CXX11}") +set(Intel121_CXX11 "${_cmake_oldestSupported} && ${DETECT_CXX11}") set(_cmake_feature_test_cxx_variadic_templates "${Intel121_CXX11}") set(_cmake_feature_test_cxx_alias_templates "${Intel121_CXX11}") set(_cmake_feature_test_cxx_nullptr "${Intel121_CXX11}") set(_cmake_feature_test_cxx_trailing_return_types "${Intel121_CXX11}") set(_cmake_feature_test_cxx_attributes "${Intel121_CXX11}") set(_cmake_feature_test_cxx_default_function_template_args "${Intel121_CXX11}") - -set(Intel12_CXX11 "__INTEL_COMPILER >= 1200 && ${DETECT_CXX11}") -set(_cmake_feature_test_cxx_extended_friend_declarations "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_rvalue_references "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_decltype "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_defaulted_functions "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_deleted_functions "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_local_type_template_args "${Intel12_CXX11}") -set(_cmake_feature_test_cxx_lambdas "${Intel12_CXX11}") - -set(Intel11_CXX11 "${_cmake_oldestSupported} && ${DETECT_CXX11}") -set(_cmake_feature_test_cxx_binary_literals "${Intel11_CXX11}") -set(_cmake_feature_test_cxx_static_assert "${Intel11_CXX11}") -set(_cmake_feature_test_cxx_right_angle_brackets "${Intel11_CXX11}") -set(_cmake_feature_test_cxx_auto_type "${Intel11_CXX11}") -set(_cmake_feature_test_cxx_extern_templates "${Intel11_CXX11}") -set(_cmake_feature_test_cxx_variadic_macros "${Intel11_CXX11}") -set(_cmake_feature_test_cxx_long_long_type "${Intel11_CXX11}") -set(_cmake_feature_test_cxx_func_identifier "${Intel11_CXX11}") -set(_cmake_feature_test_cxx_template_template_parameters "${Intel11_CXX11}") +set(_cmake_feature_test_cxx_extended_friend_declarations "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_rvalue_references "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_decltype "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_defaulted_functions "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_deleted_functions "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_local_type_template_args "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_lambdas "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_binary_literals "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_static_assert "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_right_angle_brackets "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_auto_type "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_extern_templates "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_variadic_macros "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_long_long_type "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_func_identifier "${Intel121_CXX11}") +set(_cmake_feature_test_cxx_template_template_parameters "${Intel121_CXX11}") |