diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-01-11 15:38:10 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-01-11 15:52:05 (GMT) |
| commit | 98965fb12d0d07deb6d953624529f8b8151dce13 (patch) | |
| tree | 9676f233e47652753c1ef4d68b7a8d03db2e35df /Modules/Compiler | |
| parent | a15675efc3d96906d4e803def2e83fd3bd1cf812 (diff) | |
| download | CMake-98965fb12d0d07deb6d953624529f8b8151dce13.zip CMake-98965fb12d0d07deb6d953624529f8b8151dce13.tar.gz CMake-98965fb12d0d07deb6d953624529f8b8151dce13.tar.bz2 | |
Features: Record dialect flags for AppleClang 4.0+.
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/AppleClang-C.cmake | 2 | ||||
| -rw-r--r-- | Modules/Compiler/AppleClang-CXX.cmake | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake index 10edc74..b7c1aca 100644 --- a/Modules/Compiler/AppleClang-C.cmake +++ b/Modules/Compiler/AppleClang-C.cmake @@ -1,7 +1,7 @@ include(Compiler/Clang) __compiler_clang(C) -if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.1) +if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90") diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake index eb97f88..e56f55b 100644 --- a/Modules/Compiler/AppleClang-CXX.cmake +++ b/Modules/Compiler/AppleClang-CXX.cmake @@ -5,13 +5,16 @@ if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") endif() -if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1) +if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0) set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++98") set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=gnu++98") set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11") set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11") +endif() +if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1) + # AppleClang 5.0 knows this flag, but does not set a __cplusplus macro greater than 201103L set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y") set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y") endif() |