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 | |
| parent | d1aa2b3f607b35dc5dbf613b2334b6d243ec2bda (diff) | |
| download | CMake-0198502ff4fa3dec9cbd3249f6f458f53a8087f3.zip CMake-0198502ff4fa3dec9cbd3249f6f458f53a8087f3.tar.gz CMake-0198502ff4fa3dec9cbd3249f6f458f53a8087f3.tar.bz2 | |
Intel: Use common compiler macros for language standard default
| -rw-r--r-- | Modules/Compiler/Intel-C.cmake | 18 | ||||
| -rw-r--r-- | Modules/Compiler/Intel-CXX.cmake | 15 | ||||
| -rw-r--r-- | Modules/Compiler/Intel.cmake | 2 |
3 files changed, 6 insertions, 29 deletions
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake index 9c67fbd..d583dba 100644 --- a/Modules/Compiler/Intel-C.cmake +++ b/Modules/Compiler/Intel-C.cmake @@ -30,25 +30,11 @@ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0) set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=${_ext}99") endif() -if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1) - if (NOT CMAKE_C_COMPILER_FORCED) - if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT) - message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version ${CMAKE_C_COMPILER_VERSION}") - endif() - set(CMAKE_C_STANDARD_DEFAULT ${CMAKE_C_STANDARD_COMPUTED_DEFAULT}) - elseif(NOT DEFINED CMAKE_C_STANDARD_DEFAULT) - # Compiler id was forced so just guess the default standard level. - if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0) - set(CMAKE_C_STANDARD_DEFAULT 11) - else() - set(CMAKE_C_STANDARD_DEFAULT 90) - endif() - endif() -endif() - unset(_std) unset(_ext) +__compiler_check_default_language_standard(C 12.1 90 15.0.0 11) + macro(cmake_record_c_compile_features) set(_result 0) if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1) 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) diff --git a/Modules/Compiler/Intel.cmake b/Modules/Compiler/Intel.cmake index 06d01f1..635ac4d 100644 --- a/Modules/Compiler/Intel.cmake +++ b/Modules/Compiler/Intel.cmake @@ -8,6 +8,8 @@ if(__COMPILER_INTEL) endif() set(__COMPILER_INTEL 1) +include(Compiler/CMakeCommonCompilerMacros) + if(CMAKE_HOST_WIN32) # MSVC-like macro(__compiler_intel lang) |