This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via b3f751575385969e808fdaf45de09958822d5b1a (commit) via 21e2814ab5411d9f0e14e52fe12c7a3405cbee9b (commit) from e4ce56bf57e165763dc206ff0b79d91d256548f1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3f751575385969e808fdaf45de09958822d5b1a commit b3f751575385969e808fdaf45de09958822d5b1a Merge: e4ce56b 21e2814 Author: Robert Maynard <robert.mayn...@kitware.com> AuthorDate: Wed Apr 27 16:36:16 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Apr 27 16:36:16 2016 -0400 Merge topic 'intel-compiler-features' into next 21e2814a Features: Specify minimum Intel version to 12.1 for C and C++. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21e2814ab5411d9f0e14e52fe12c7a3405cbee9b commit 21e2814ab5411d9f0e14e52fe12c7a3405cbee9b Author: Robert Maynard <robert.mayn...@kitware.com> AuthorDate: Wed Apr 27 15:28:33 2016 -0400 Commit: Robert Maynard <robert.mayn...@kitware.com> CommitDate: Wed Apr 27 16:33:34 2016 -0400 Features: Specify minimum Intel version to 12.1 for C and C++. Versions below 12.1 don't provide enough information to properly detect if compiling with c++98 or c++0x enabled so remove them from the supported list. diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake index cfd7421..eb9602a 100644 --- a/Modules/Compiler/Intel-C.cmake +++ b/Modules/Compiler/Intel-C.cmake @@ -19,14 +19,14 @@ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0) set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=c11") endif() -if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0) +if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1) set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=c89") set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99") set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=c99") endif() -if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0) +if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1) if (NOT CMAKE_C_COMPILER_FORCED) if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT) message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version ${CMAKE_C_COMPILER_VERSION}") @@ -51,7 +51,7 @@ macro(cmake_record_c_compile_features) set(_result 0) if (NOT "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC" AND - NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0) + NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1) if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0) _get_intel_c_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES) endif() 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}") ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/Intel-C.cmake | 6 ++-- Modules/Compiler/Intel-CXX-FeatureTests.cmake | 40 +++++++++++-------------- 2 files changed, 21 insertions(+), 25 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits