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 cb2fab90674de77fb8fafdee90a3f1c266d75f05 (commit) via 66e8b568dec347cc6202bd3a81526ee0491079df (commit) from 70948c3041c83aea59b15d873e5248cabe303bbe (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=cb2fab90674de77fb8fafdee90a3f1c266d75f05 commit cb2fab90674de77fb8fafdee90a3f1c266d75f05 Merge: 70948c3 66e8b56 Author: Robert Maynard <robert.mayn...@kitware.com> AuthorDate: Wed Apr 27 10:12:50 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Apr 27 10:12:50 2016 -0400 Merge topic 'intel-compiler-features' into next 66e8b568 Features: Update features for Intel 15 for lang C https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66e8b568dec347cc6202bd3a81526ee0491079df commit 66e8b568dec347cc6202bd3a81526ee0491079df Author: Robert Maynard <robert.mayn...@kitware.com> AuthorDate: Wed Apr 27 10:11:47 2016 -0400 Commit: Robert Maynard <robert.mayn...@kitware.com> CommitDate: Wed Apr 27 10:11:47 2016 -0400 Features: Update features for Intel 15 for lang C diff --git a/Modules/Compiler/Intel-C-FeatureTests.cmake b/Modules/Compiler/Intel-C-FeatureTests.cmake index 5a0860f..34175c8 100644 --- a/Modules/Compiler/Intel-C-FeatureTests.cmake +++ b/Modules/Compiler/Intel-C-FeatureTests.cmake @@ -10,7 +10,8 @@ endif() set(DETECT_C99 "defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") -set(_cmake_feature_test_c_static_assert "__INTEL_COMPILER >= 1500 && ${DETECT_C99}") +#static assert is only around in version 1500 update 2 and above +set(_cmake_feature_test_c_static_assert "(__INTEL_COMPILER > 1500 || (__INTEL_COMPILER == 1500 && __INTEL_COMPILER_UPDATE > 1) ) && ${DETECT_C99}") set(_cmake_oldestSupported "__INTEL_COMPILER >= 1110") set(Intel_C99 "${_cmake_oldestSupported} && ${DETECT_C99}") ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/Intel-C-FeatureTests.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits