diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2017-05-01 17:02:02 (GMT) |
|---|---|---|
| committer | Chuck Atkins <chuck.atkins@kitware.com> | 2017-05-02 13:49:23 (GMT) |
| commit | 0198502ff4fa3dec9cbd3249f6f458f53a8087f3 (patch) | |
| tree | 053f20ebce538f7bb476e1cf7f528f96262cf891 /Modules/Compiler/Intel-CXX.cmake | |
| parent | d1aa2b3f607b35dc5dbf613b2334b6d243ec2bda (diff) | |
| download | CMake-0198502ff4fa3dec9cbd3249f6f458f53a8087f3.zip CMake-0198502ff4fa3dec9cbd3249f6f458f53a8087f3.tar.gz CMake-0198502ff4fa3dec9cbd3249f6f458f53a8087f3.tar.bz2 | |
Intel: Use common compiler macros for language standard default
Diffstat (limited to 'Modules/Compiler/Intel-CXX.cmake')
| -rw-r--r-- | Modules/Compiler/Intel-CXX.cmake | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake index 9c39236..4aef30a 100644 --- a/Modules/Compiler/Intel-CXX.cmake +++ b/Modules/Compiler/Intel-CXX.cmake @@ -47,22 +47,11 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1) endif() endif() -if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1) - if (NOT CMAKE_CXX_COMPILER_FORCED) - if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT) - message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version ${CMAKE_CXX_COMPILER_VERSION}") - else() - set(CMAKE_CXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT}) - endif() - elseif (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT) - # Compiler id was forced so just guess the default standard level. - set(CMAKE_CXX_STANDARD_DEFAULT 98) - endif() -endif() - unset(_std) unset(_ext) +__compiler_check_default_language_standard(CXX 12.1 98) + macro(cmake_record_cxx_compile_features) set(_result 0) if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1) |