This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 1eb9a7476c6671ecfd5a6ffea5664a839c5badf5 (commit)
via d0430c0a3eb965aca4f8df4496e06917b352d7fe (commit)
from b5b1405f2e1b8078acfb6954418bd5eeb993685c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1eb9a7476c6671ecfd5a6ffea5664a839c5badf5
commit 1eb9a7476c6671ecfd5a6ffea5664a839c5badf5
Merge: b5b1405 d0430c0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jul 8 09:46:21 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jul 8 09:46:21 2015 -0400
Merge topic 'compiler-feature-AppleClang-std-flags' into next
d0430c0a AppleClang: Use modern C++14 standard flags for Xcode 6
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0430c0a3eb965aca4f8df4496e06917b352d7fe
commit d0430c0a3eb965aca4f8df4496e06917b352d7fe
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jul 8 09:25:02 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jul 8 09:26:57 2015 -0400
AppleClang: Use modern C++14 standard flags for Xcode 6
The Clang compiler that comes with Xcode 6 is aware of the modern
-std=c++14 and -std=gnu++14 flags, so use them instead of the "1y"
flags.
Suggested-by: darkapos...@rule506.net
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")
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/AppleClang-CXX.cmake | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
