[Cmake-commits] CMake branch, master, updated. v3.11.0-rc3-238-g6723261

[Kitware Robot]

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, master has been updated
       via  67232619319dfa3ebfaa5f1cda141bfec6b3ee9b (commit)
       via  bd64d60194edeba43746339212f85935b4a82c62 (commit)
       via  aaf56620d11bc3f497b5327bfd5a69f7471a8620 (commit)
       via  c388487bd5ec14c8bc9e61202d0c5302fda5bd15 (commit)
       via  298e1bfe2870d649ed1ec0054137d6417c7d5ef2 (commit)
       via  194b74daec04c46ab1ae3c5b18d51ae805a9dbe0 (commit)
       via  25eb6e60d7079aa911031bd66b72b61379ed6c22 (commit)
       via  7bbaead87d8e9096d8ba90e0eb239d9c76840fff (commit)
       via  8c92596e9621e687b333f3dcdac5c2bb6d5ca1b1 (commit)
      from  07f9f41f503985dbd1fb0a657beadcfee95347e0 (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=67232619319dfa3ebfaa5f1cda141bfec6b3ee9b
commit 67232619319dfa3ebfaa5f1cda141bfec6b3ee9b
Merge: bd64d60 298e1bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 15 07:53:35 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 15 07:53:35 2018 -0400

    Merge branch 'release-3.11'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd64d60194edeba43746339212f85935b4a82c62
commit bd64d60194edeba43746339212f85935b4a82c62
Merge: aaf5662 194b74d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 15 11:51:49 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Mar 15 07:52:59 2018 -0400

    Merge topic 'xl-cc-default-std'
    
    194b74daec XL: Fix C default level detection when invoked as 'cc'
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1854


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaf56620d11bc3f497b5327bfd5a69f7471a8620
commit aaf56620d11bc3f497b5327bfd5a69f7471a8620
Merge: c388487 25eb6e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 15 11:51:32 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Mar 15 07:52:19 2018 -0400

    Merge topic 'bootstrap-clarify-error'
    
    25eb6e60d7 bootstrap: Clarify error when building with invalid CXXFLAGS
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Acked-by: Ben Boeckel <ben.boeckel at kitware.com>
    Merge-request: !1850


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c388487bd5ec14c8bc9e61202d0c5302fda5bd15
commit c388487bd5ec14c8bc9e61202d0c5302fda5bd15
Merge: 07f9f41 8c92596
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 15 11:51:18 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Mar 15 07:51:29 2018 -0400

    Merge topic 'findjni-mips-r6-new-arch'
    
    8c92596e96 FindJNI: add some new architecture names for mips release 6
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1853


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25eb6e60d7079aa911031bd66b72b61379ed6c22
commit 25eb6e60d7079aa911031bd66b72b61379ed6c22
Author:     Ben Chaney <chaneybenjamini at gmail.com>
AuthorDate: Wed Mar 14 00:10:54 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 14 11:28:10 2018 -0400

    bootstrap: Clarify error when building with invalid CXXFLAGS
    
    Mention the flags used when complaining that the compiler does not work.

diff --git a/bootstrap b/bootstrap
index 0bee6c5..d152c34 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1116,8 +1116,10 @@ done
 rm -f "${TMPFILE}.cxx"
 
 if [ -z "${cmake_cxx_compiler}" ]; then
-cmake_error 7 "Cannot find a C++ compiler supporting C++11 on this system.
+cmake_error 7 "Cannot find a C++ compiler that supports both C++11 and the specified C++ flags.
 Please specify one using environment variable CXX.
+The C++ flags are \"$cmake_cxx_flags\".
+They can be changed using the environment variable CXXFLAGS.
 See cmake_bootstrap.log for compilers attempted."
 fi
 echo "C++ compiler on this system is: ${cmake_cxx_compiler} ${cmake_cxx_flags}"

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

Summary of changes:
 Modules/CMakeCCompilerId.c.in |    3 ++-
 Modules/FindJNI.cmake         |    5 ++++-
 bootstrap                     |    4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake