[Cmake-commits] CMake branch, master, updated. v3.4.2-865-g184be68

[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, master has been updated
       via  184be68580d19900b289bfc45d507980ea2bce8b (commit)
       via  77cd74a3ea964fa390d85c371902387e9ffc4a92 (commit)
      from  606ad1764ee8aff62368878576ecec7dd8671bae (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=184be68580d19900b289bfc45d507980ea2bce8b
commit 184be68580d19900b289bfc45d507980ea2bce8b
Merge: 606ad17 77cd74a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 20 08:33:35 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 20 08:33:35 2016 -0500

    Merge topic 'cache-parse-error-line-number'
    
    77cd74a3 Print line number of cache parse errors (#11109)


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

Summary of changes:
 Source/cmCacheManager.cxx                                    |   10 ++++++++--
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake                |    5 +++++
 .../cache-bad-entry-result.txt}                              |    0
 Tests/RunCMake/CommandLine/cache-bad-entry-stderr.txt        |    1 +
 Tests/RunCMake/CommandLine/cache-bad-entry/CMakeCache.txt    |   10 ++++++++++
 .../cache-empty-entry-result.txt}                            |    0
 Tests/RunCMake/CommandLine/cache-empty-entry-stderr.txt      |    1 +
 Tests/RunCMake/CommandLine/cache-empty-entry/CMakeCache.txt  |    7 +++++++
 8 files changed, 32 insertions(+), 2 deletions(-)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/cache-bad-entry-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/cache-bad-entry-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/cache-bad-entry/CMakeCache.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/cache-empty-entry-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/cache-empty-entry-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/cache-empty-entry/CMakeCache.txt


hooks/post-receive
-- 
CMake