diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-03 15:00:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-03 15:01:12 (GMT) |
| commit | bf3c08d648c398026eef363bb43d3f8bfaf2a286 (patch) | |
| tree | 9c325a427ffb2df7298ce512345d211df1a1d45c /Modules/Compiler/AppleClang-C.cmake | |
| parent | f1e91c694b1581b4ae923b3bd4a243372cb29023 (diff) | |
| parent | d908987634ad1dd1295ac585ffe7c810bda69415 (diff) | |
| download | CMake-bf3c08d648c398026eef363bb43d3f8bfaf2a286.zip CMake-bf3c08d648c398026eef363bb43d3f8bfaf2a286.tar.gz CMake-bf3c08d648c398026eef363bb43d3f8bfaf2a286.tar.bz2 | |
Merge topic 'port-language-default-to-common-macro'
d9089876 AppleClang: Use common compiler macros for language standard default
174c02e1 SunPro: Use common compiler macros for language standard default
08fa2ba8 Clang: Use common compiler macros for language standard default
0198502f Intel: Use common compiler macros for language standard default
d1aa2b3f GNU: Use common compiler macros for language standard default
87b9d6d9 XL: Use common compiler macros for language standard default
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !787
Diffstat (limited to 'Modules/Compiler/AppleClang-C.cmake')
| -rw-r--r-- | Modules/Compiler/AppleClang-C.cmake | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake index f874e74..c18f541 100644 --- a/Modules/Compiler/AppleClang-C.cmake +++ b/Modules/Compiler/AppleClang-C.cmake @@ -12,17 +12,7 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0) set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11") endif() -if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0) - 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. - set(CMAKE_C_STANDARD_DEFAULT 99) - endif() -endif() +__compiler_check_default_language_standard(C 4.0 99) macro(cmake_record_c_compile_features) set(_result 0) |