diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-25 15:07:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-25 15:07:34 (GMT) |
| commit | f8099e1c37094ae65506ce1f2ea78453556fc42d (patch) | |
| tree | bdc8b4a3816aa1ed102599a32273d8d23c2beab3 /Modules | |
| parent | 64678cbc0a27344a593221e4024388569d4846d1 (diff) | |
| parent | 36bb100e2b4e5586cecb0dc4e4488b3e8dd18f69 (diff) | |
| download | CMake-f8099e1c37094ae65506ce1f2ea78453556fc42d.zip CMake-f8099e1c37094ae65506ce1f2ea78453556fc42d.tar.gz CMake-f8099e1c37094ae65506ce1f2ea78453556fc42d.tar.bz2 | |
Merge branch 'default-lang-dialect' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/Clang-C.cmake | 10 | ||||
| -rw-r--r-- | Modules/Compiler/GNU-C.cmake | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake index 05d3c0b..d504d69 100644 --- a/Modules/Compiler/Clang-C.cmake +++ b/Modules/Compiler/Clang-C.cmake @@ -6,7 +6,7 @@ if(WIN32 OR (APPLE AND NOT appleClangPolicy STREQUAL NEW)) return() endif() -if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) +if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90") @@ -17,14 +17,18 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11") endif() -set(CMAKE_C_STANDARD_DEFAULT 90) +if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6) + set(CMAKE_C_STANDARD_DEFAULT 11) +elseif(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) + set(CMAKE_C_STANDARD_DEFAULT 99) +endif() macro(cmake_record_c_compile_features) macro(_get_clang_features std_version list) record_compiler_features(C "-std=${std_version}" ${list}) endmacro() - if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) + if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) _get_clang_features(c11 CMAKE_C11_COMPILE_FEATURES) if (_result EQUAL 0) _get_clang_features(c99 CMAKE_C99_COMPILE_FEATURES) diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake index 35954be..24d439d 100644 --- a/Modules/Compiler/GNU-C.cmake +++ b/Modules/Compiler/GNU-C.cmake @@ -12,8 +12,11 @@ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7) set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11") endif() -# This may change in a future GNU version. -set(CMAKE_C_STANDARD_DEFAULT 90) +if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0) + set(CMAKE_C_STANDARD_DEFAULT 11) +else(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7) + set(CMAKE_C_STANDARD_DEFAULT 90) +endif() macro(cmake_record_c_compile_features) macro(_get_gcc_features std_version list) |