diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-26 15:37:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-26 15:37:46 (GMT) |
| commit | 5a611495c220af559e93aa29d5bfc786ff40d440 (patch) | |
| tree | 3aeece099c1d55bfd9c333f0b9edcfe27754b2a8 /Modules/Compiler | |
| parent | 94c7ff9fef395a2f970ea9ae9076549b8943f566 (diff) | |
| parent | d0af0faefbeca4f2821ddafe34a0b52032ee01a7 (diff) | |
| download | CMake-5a611495c220af559e93aa29d5bfc786ff40d440.zip CMake-5a611495c220af559e93aa29d5bfc786ff40d440.tar.gz CMake-5a611495c220af559e93aa29d5bfc786ff40d440.tar.bz2 | |
Merge topic 'C-features-Wundef'
d0af0fae WCDH: Make the header -Wundef safe for the C language.
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/Clang-C-FeatureTests.cmake | 4 | ||||
| -rw-r--r-- | Modules/Compiler/GNU-C-FeatureTests.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Modules/Compiler/Clang-C-FeatureTests.cmake b/Modules/Compiler/Clang-C-FeatureTests.cmake index 4a72e87..2d8673d 100644 --- a/Modules/Compiler/Clang-C-FeatureTests.cmake +++ b/Modules/Compiler/Clang-C-FeatureTests.cmake @@ -1,9 +1,9 @@ set(_cmake_oldestSupported "((__clang_major__ * 100) + __clang_minor__) >= 304") -set(Clang_C11 "${_cmake_oldestSupported} && __STDC_VERSION__ >= 201112L") +set(Clang_C11 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L") set(_cmake_feature_test_c_static_assert "${Clang_C11}") -set(Clang_C99 "${_cmake_oldestSupported} && __STDC_VERSION__ >= 199901L") +set(Clang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") set(_cmake_feature_test_c_restrict "${Clang_C99}") set(_cmake_feature_test_c_variadic_macros "${Clang_C99}") diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake index dc1695c..dfaeebf 100644 --- a/Modules/Compiler/GNU-C-FeatureTests.cmake +++ b/Modules/Compiler/GNU-C-FeatureTests.cmake @@ -1,10 +1,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 407") -set(GNU46_C11 "${_cmake_oldestSupported} && __STDC_VERSION__ >= 201112L") +set(GNU46_C11 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L") set(_cmake_feature_test_c_static_assert "${GNU46_C11}") # Since 4.4 at least: -set(GNU44_C99 "${_cmake_oldestSupported} && __STDC_VERSION__ >= 199901L") +set(GNU44_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") set(_cmake_feature_test_c_restrict "${GNU44_C99}") set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}") |