[Cmake-commits] CMake branch, master, updated. v3.1.0-936-g40c11f0

[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  40c11f0f62af1365cee44111429946862b5cf93f (commit)
       via  27c6da933ec1dd4028bb80e4adf2fa7309ef4a04 (commit)
      from  afd998373da0d0c39266b5c7a078ee48aa939554 (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=40c11f0f62af1365cee44111429946862b5cf93f
commit 40c11f0f62af1365cee44111429946862b5cf93f
Merge: afd9983 27c6da9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 21 16:36:22 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 21 16:36:22 2015 -0500

    Merge topic 'jsoncpp-third-party'
    
    27c6da93 Add option to build CMake against a system jsoncpp


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

Summary of changes:
 CMakeLists.txt                |   23 ++++++++++++++++++++---
 Source/CMakeLists.txt         |    2 +-
 Utilities/cmThirdParty.h.in   |    1 +
 Utilities/cm_jsoncpp_reader.h |    7 ++++++-
 Utilities/cm_jsoncpp_value.h  |    7 ++++++-
 Utilities/cm_jsoncpp_writer.h |    7 ++++++-
 6 files changed, 40 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake