[cmake-developers] AppleClang-CXX.cmake needs an update
darkapostle at rule506.net
darkapostle at rule506.net
Wed Jul 8 03:08:52 EDT 2015
C++14 is a first class citizen in Xcode 6.
*diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-
CXX.cmake* *index 5194da4..27e4d8a 100644*
*--- a/Modules/Compiler/AppleClang-CXX.cmake*
*+++ b/Modules/Compiler/AppleClang-CXX.cmake*
@@ -13,7 +13,10 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
endif()
-if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+ set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
+ set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
+elseif(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")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/cmake-developers/attachments/20150708/11117c1c/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: AppleClang-CXX.cmake.diff
Type: application/octet-stream
Size: 843 bytes
Desc: not available
URL: <http://public.kitware.com/pipermail/cmake-developers/attachments/20150708/11117c1c/attachment.obj>
More information about the cmake-developers
mailing list