diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-03 12:38:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-03 12:38:23 (GMT) |
| commit | b902f2a98a6764857f74608250219186f262a207 (patch) | |
| tree | 6900531844c537cc58006245d77fb480334558e0 | |
| parent | 369d580937b49c1c5672ba3512c2a736581d545c (diff) | |
| download | CMake-b902f2a98a6764857f74608250219186f262a207.zip CMake-b902f2a98a6764857f74608250219186f262a207.tar.gz CMake-b902f2a98a6764857f74608250219186f262a207.tar.bz2 | |
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.
| -rw-r--r-- | Modules/Compiler/Intel-CXX-FeatureTests.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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] |