[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-921-ga041242
Brad King
brad.king at kitware.com
Thu Jul 9 09:11:50 EDT 2015
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 a0412429b1542badfdae26fbd0a4c40b4fe51001 (commit)
via 8340e9e6df571329af9427dc47e87f71799984a6 (commit)
from e5d3d2a8723f304cd5f4b7008df60e2b2bd7df69 (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=a0412429b1542badfdae26fbd0a4c40b4fe51001
commit a0412429b1542badfdae26fbd0a4c40b4fe51001
Merge: e5d3d2a 8340e9e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 9 09:11:49 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 9 09:11:49 2015 -0400
Merge topic 'compiler-feature-AppleClang-std-flags' into next
8340e9e6 fixup! AppleClang: Use modern C++14 standard flags for Xcode 6
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8340e9e6df571329af9427dc47e87f71799984a6
commit 8340e9e6df571329af9427dc47e87f71799984a6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 9 09:11:02 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 9 09:11:02 2015 -0400
fixup! AppleClang: Use modern C++14 standard flags for Xcode 6
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 27e4d8a..1ba8a77 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -13,7 +13,7 @@ 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 6.0)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1)
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)
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/AppleClang-CXX.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list