From b902f2a98a6764857f74608250219186f262a207 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 3 Nov 2016 08:38:23 -0400 Subject: 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. --- Modules/Compiler/Intel-CXX-FeatureTests.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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] -- cgit v0.12