diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-30 15:15:05 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-02 11:22:43 -0500 |
| commit | 684e4d205d64ff8b98c00a1d6a358bffbf509c62 (patch) | |
| tree | 55e5ba78f5658823eda8d299e671bdec7f14b412 /Modules/Compiler/GNU-C.cmake | |
| parent | f2035cbd0d631698ec911e72d0d857fd32d2db7a (diff) | |
| download | cmake-684e4d205d64ff8b98c00a1d6a358bffbf509c62.tar.gz | |
Features: Make feature recording conditions more consistent
Condition all calls to `_record_compiler_features_{c,cxx}` on
`_result EQUAL 0` so that adding new language standards later does
not need to update them. Avoid some duplicate compiler version
checks by conditioning C11 and CXX14 feature recording on the
existence of `CMAKE_{C11,CXX14}_STANDARD_COMPILE_OPTION` (whose
setting already used the version check).
Diffstat (limited to 'Modules/Compiler/GNU-C.cmake')
| -rw-r--r-- | Modules/Compiler/GNU-C.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake index 4dbf6efd57..05c3bb2b43 100644 --- a/Modules/Compiler/GNU-C.cmake +++ b/Modules/Compiler/GNU-C.cmake @@ -41,10 +41,10 @@ endif() macro(cmake_record_c_compile_features) set(_result 0) - if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6) - _record_compiler_features_c(11) - endif() if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) + if(_result EQUAL 0 AND CMAKE_C11_STANDARD_COMPILE_OPTION) + _record_compiler_features_c(11) + endif() if (_result EQUAL 0) _record_compiler_features_c(99) endif() |