[Cmake-commits] CMake branch, next, updated. v3.2.0-966-g737eb5c

[Brad King]

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  737eb5caab017e16ae73d9ce53ab566bda04e891 (commit)
       via  77534e84b27701e371ccee780be5acffe7cced59 (commit)
      from  5efa12d728240c156b4ee9463a6dc18690cafb1b (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=737eb5caab017e16ae73d9ce53ab566bda04e891
commit 737eb5caab017e16ae73d9ce53ab566bda04e891
Merge: 5efa12d 77534e8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 10 14:50:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 10 14:50:42 2015 -0400

    Merge topic 'allow-no-language-standard' into next
    
    77534e84 Add options to build CMake without any language dialects


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77534e84b27701e371ccee780be5acffe7cced59
commit 77534e84b27701e371ccee780be5acffe7cced59
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 10 14:49:40 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 10 14:49:40 2015 -0400

    Add options to build CMake without any language dialects
    
    If CMake_NO_<LANG>_STANDARD is set, do not set CMAKE_<LANG>_STANDARD.
    This will allow users to build with their own -std= flags without
    CMake adding any itself.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1250a94..d86ae96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,10 +37,10 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
 endif()
 
 # Use most-recent available language dialects with GNU and Clang
-if(NOT DEFINED CMAKE_C_STANDARD)
+if(NOT DEFINED CMAKE_C_STANDARD AND NOT CMake_NO_C_STANDARD)
   set(CMAKE_C_STANDARD 11)
 endif()
-if(NOT DEFINED CMAKE_CXX_STANDARD)
+if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 14)
 endif()
 

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake