diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-11 15:44:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-11 15:44:07 (GMT) |
| commit | 68a9fc1bca0dab0804d0ca411f933d8e9ec88093 (patch) | |
| tree | 90f22004fe8f53465be2f474a53837f5e08f07bf /Tests | |
| parent | 3bb73a051d490f1bc07ef01733b75e260e0dc944 (diff) | |
| parent | 5e428389615da64208c40be256a30f8c9e988523 (diff) | |
| download | CMake-68a9fc1bca0dab0804d0ca411f933d8e9ec88093.zip CMake-68a9fc1bca0dab0804d0ca411f933d8e9ec88093.tar.gz CMake-68a9fc1bca0dab0804d0ca411f933d8e9ec88093.tar.bz2 | |
Merge topic 'intel-compile-features'
5e428389 Features: Detect Intel C++14 mode more reliably
1f848031 Features: Suppress c_static_assert test coverage on Intel <= 15
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CompileFeatures/CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt index 9f61186..8acdd93 100644 --- a/Tests/CompileFeatures/CMakeLists.txt +++ b/Tests/CompileFeatures/CMakeLists.txt @@ -170,6 +170,15 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel") endif() endif() +if (CMAKE_C_COMPILER_ID STREQUAL "Intel") + if (CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.2) + # This works on some pre-15.0.2 versions and not others. + list(REMOVE_ITEM C_non_features + c_static_assert + ) + endif() +endif() + set(C_ext c) set(C_standard_flag 11) set(CXX_ext cpp) |