diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-05 14:25:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-05 14:25:14 (GMT) |
| commit | 9042c875dcbd0f4b7150e9050b60fb0d40365e45 (patch) | |
| tree | 046a4e8dae32734af5d2001ad8255ee866536b5e /Modules/Compiler/AppleClang-CXX.cmake | |
| parent | 0ae11b1fb0925a172adcc7cc3c9b804e2ece9ba7 (diff) | |
| parent | fb3487a9975ed321b48fad5c71dd655d66b68087 (diff) | |
| download | CMake-9042c875dcbd0f4b7150e9050b60fb0d40365e45.zip CMake-9042c875dcbd0f4b7150e9050b60fb0d40365e45.tar.gz CMake-9042c875dcbd0f4b7150e9050b60fb0d40365e45.tar.bz2 | |
Merge topic 'fix-C-standard-features'
fb3487a9 Features: Fix C90 feature detection.
6027798a Features: Allow setting standard dialect below the default.
9d767810 Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
72537e44 Features: Add dialect compile flags only if default is known.
82c9d686 AppleClang: Remove redundant UNIX condition.
Diffstat (limited to 'Modules/Compiler/AppleClang-CXX.cmake')
| -rw-r--r-- | Modules/Compiler/AppleClang-CXX.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake index 978c382..5194da4 100644 --- a/Modules/Compiler/AppleClang-CXX.cmake +++ b/Modules/Compiler/AppleClang-CXX.cmake @@ -19,7 +19,9 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1) set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y") endif() -set(CMAKE_CXX_STANDARD_DEFAULT 98) +if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0) + set(CMAKE_CXX_STANDARD_DEFAULT 98) +endif() macro(cmake_record_cxx_compile_features) macro(_get_appleclang_features std_version list) @@ -27,7 +29,7 @@ macro(cmake_record_cxx_compile_features) endmacro() set(_result 0) - if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0) + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0) set(_result 0) if(CMAKE_CXX14_STANDARD_COMPILE_OPTION) _get_appleclang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES) |