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 d86565b9d0f0577bcf3428a74552001ca6f7534c (commit) via 49b8140e5db355229dd2984967e8a08713c9ea9b (commit) via 0b80fc350ae71f0926b426762cb1f6efe17a5723 (commit) from e1dc2e3050c1c61489ccff85479d03f81a98c084 (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=d86565b9d0f0577bcf3428a74552001ca6f7534c commit d86565b9d0f0577bcf3428a74552001ca6f7534c Merge: e1dc2e3 49b8140 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Sep 17 08:58:15 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Sep 17 08:58:15 2014 -0400 Merge topic 'clang-compile-options-cxx14' into next 49b8140e Clang: Enable c++14 dialect flag with Clang 3.5. 0b80fc35 Clang: Don't overwrite c++11 compile option value with c++14 flag. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49b8140e5db355229dd2984967e8a08713c9ea9b commit 49b8140e5db355229dd2984967e8a08713c9ea9b Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Sep 17 14:57:07 2014 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed Sep 17 14:57:07 2014 +0200 Clang: Enable c++14 dialect flag with Clang 3.5. diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake index 7792999..5dd7b4a 100644 --- a/Modules/Compiler/Clang-CXX.cmake +++ b/Modules/Compiler/Clang-CXX.cmake @@ -23,7 +23,10 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.1) set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x") endif() -if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) +if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5) + 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 3.4) set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y") set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y") endif() http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b80fc350ae71f0926b426762cb1f6efe17a5723 commit 0b80fc350ae71f0926b426762cb1f6efe17a5723 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Sep 17 14:56:16 2014 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed Sep 17 14:56:16 2014 +0200 Clang: Don't overwrite c++11 compile option value with c++14 flag. diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake index bdb6d69..7792999 100644 --- a/Modules/Compiler/Clang-CXX.cmake +++ b/Modules/Compiler/Clang-CXX.cmake @@ -24,8 +24,8 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.1) endif() if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) - set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++1y") - set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++1y") + set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y") + set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y") endif() set(CMAKE_CXX_STANDARD_DEFAULT 98) ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/Clang-CXX.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits