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 ad137b5af4f40f7c07df7da67684082c5e4a5012 (commit) via de022e8908cc5b3a6e0f179a81482fad4cfb6072 (commit) from 86777356c5ebfc43fbbf5aabceaeea02d6b3f84e (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=ad137b5af4f40f7c07df7da67684082c5e4a5012 commit ad137b5af4f40f7c07df7da67684082c5e4a5012 Merge: 8677735 de022e8 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Dec 5 14:09:05 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Dec 5 14:09:05 2014 -0500 Merge topic 'optional-latest-language-dialects' into next de022e89 Add options to build CMake without latest language dialects http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de022e8908cc5b3a6e0f179a81482fad4cfb6072 commit de022e8908cc5b3a6e0f179a81482fad4cfb6072 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Dec 5 14:06:43 2014 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Dec 5 14:07:59 2014 -0500 Add options to build CMake without latest language dialects Set CMAKE_C_STANDARD and CMAKE_CXX_STANDARD only if they are not already defined. This will allow users to add the settings with different values to their local cache (e.g. on the command line). diff --git a/CMakeLists.txt b/CMakeLists.txt index ad3bb97..1812b27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,8 +37,12 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") endif() # Use most-recent available language dialects with GNU and Clang -set(CMAKE_C_STANDARD 11) -set(CMAKE_CXX_STANDARD 14) +if(NOT DEFINED CMAKE_C_STANDARD) + set(CMAKE_C_STANDARD 11) +endif() +if(NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 14) +endif() # option to set the internal encoding of CMake to UTF-8 option(CMAKE_ENCODING_UTF8 "Use UTF-8 encoding internally (experimental)." OFF) ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits