diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-19 12:17:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-19 12:17:18 (GMT) |
| commit | cc2e5709ed91f7dba70fcc5d1516a0b75633cb25 (patch) | |
| tree | b901ad241eff5f676c75331717562f5ba9d552fb /Modules | |
| parent | dfc9036bcf65afc4aa0fd21092d47da4ccd259cb (diff) | |
| parent | fc96d99c3efae369f60db6f13cb1610121563d7f (diff) | |
| download | CMake-cc2e5709ed91f7dba70fcc5d1516a0b75633cb25.zip CMake-cc2e5709ed91f7dba70fcc5d1516a0b75633cb25.tar.gz CMake-cc2e5709ed91f7dba70fcc5d1516a0b75633cb25.tar.bz2 | |
Merge topic 'intel-initializer-list'
fc96d99c3e Features: Record initializer list support for Intel 14 and above
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1855
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/Intel-CXX-FeatureTests.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake index 929a7c6..bbefe15 100644 --- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake +++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake @@ -31,11 +31,6 @@ set(_cmake_feature_test_cxx_aggregate_default_initializers "${Intel16_CXX14}") set(_cmake_feature_test_cxx_contextual_conversions "${Intel16_CXX14}") set(_cmake_feature_test_cxx_generic_lambdas "__cpp_generic_lambdas >= 201304") set(_cmake_feature_test_cxx_digit_separators "${Intel16_CXX14}") -# This test is supposed to work in Intel 14 but the compiler has a bug -# in versions 14 and 15:: -# https://software.intel.com/en-us/forums/intel-c-compiler/topic/600514 -# It also appears to fail with an internal compiler error on Intel 16 and 17. -#set(_cmake_feature_test_cxx_generalized_initializers "${Intel16_CXX14}") unset(Intel16_CXX14) set(Intel15 "__INTEL_COMPILER >= 1500") @@ -75,6 +70,7 @@ set(_cmake_feature_test_cxx_override "${Intel14_CXX11}") set(_cmake_feature_test_cxx_final "${Intel14_CXX11}") set(_cmake_feature_test_cxx_noexcept "${Intel14_CXX11}") set(_cmake_feature_test_cxx_defaulted_move_initializers "${Intel14_CXX11}") +set(_cmake_feature_test_cxx_generalized_initializers "${Intel14_CXX11}") unset(Intel14_CXX11) set(Intel13_CXX11 "__INTEL_COMPILER >= 1300 && ${DETECT_CXX11}") |