[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-504-g622d3b3

[Daniel Pfeifer]

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  622d3b3f10d01ba1ee8dd221ef45675761b9f8da (commit)
       via  69a6db4c5e145a7b6e6b267135f3c3ed14f0e388 (commit)
      from  6c354f79f218d1115d8e3d7fb97f77b0ec43081d (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=622d3b3f10d01ba1ee8dd221ef45675761b9f8da
commit 622d3b3f10d01ba1ee8dd221ef45675761b9f8da
Merge: 6c354f7 69a6db4
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Jun 23 01:16:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 23 01:16:00 2016 -0400

    Merge topic 'compiler-features' into next
    
    69a6db4c fixup! cxx features: add check for override


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69a6db4c5e145a7b6e6b267135f3c3ed14f0e388
commit 69a6db4c5e145a7b6e6b267135f3c3ed14f0e388
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Jun 23 07:15:41 2016 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Thu Jun 23 07:15:41 2016 +0200

    fixup! cxx features: add check for override

diff --git a/bootstrap b/bootstrap
index 27cf9d8..a9f3402 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1272,6 +1272,7 @@ cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_
 cmake_report cmConfigure.h${_tmp} "#define CMAKE_BIN_DIR \"/bootstrap-not-insalled\""
 cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-insalled\""
 cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP"
+cmake_report cmConfigure.h${_tmp} "#define CM_OVERRIDE"
 
 # Regenerate configured headers
 for h in Configure VersionConfig; do

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

Summary of changes:
 bootstrap |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake