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 17c1cb103036976fed9b4b476654821629c177a0 (commit) via b902f2a98a6764857f74608250219186f262a207 (commit) from efb416046626b3c9332dde3a2e20ace755d58b9a (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=17c1cb103036976fed9b4b476654821629c177a0 commit 17c1cb103036976fed9b4b476654821629c177a0 Merge: efb4160 b902f2a Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Nov 3 08:51:01 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Nov 3 08:51:01 2016 -0400 Merge topic 'intel-compile-features-windows' into next b902f2a9 Features: Fix Intel cxx_attributes existence condition https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b902f2a98a6764857f74608250219186f262a207 commit b902f2a98a6764857f74608250219186f262a207 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Nov 3 08:38:23 2016 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Nov 3 08:38:23 2016 -0400 Features: Fix Intel cxx_attributes existence condition This condition needs to follow the same pattern added in note `[1]` by commit a5a3642f (Features: Port Intel CXX features to test macros where possible, 2016-10-26). It was accidentally left out of that commit. diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake index 5b74fab..d1a3433 100644 --- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake +++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake @@ -88,7 +88,7 @@ set(_cmake_feature_test_cxx_variadic_templates "(__cpp_variadic_templates >= 200 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 "__cpp_attributes >= 200809 || ${Intel121}") +set(_cmake_feature_test_cxx_attributes "(__cpp_attributes >= 200809 || ${Intel121}) && ${DETECT_CXX11}") # [1] set(_cmake_feature_test_cxx_default_function_template_args "${Intel121_CXX11}") set(_cmake_feature_test_cxx_extended_friend_declarations "${Intel121_CXX11}") set(_cmake_feature_test_cxx_rvalue_references "(__cpp_rvalue_references >= 200610 || ${Intel121}) && ${DETECT_CXX11}") # [1] ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/Intel-CXX-FeatureTests.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits