[Cmake-commits] CMake branch, master, updated. v3.2.0-rc1-213-g1eb1929

Brad King brad.king at kitware.com
Mon Feb 23 10:26:32 EST 2015


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  1eb192905d81943073c3cbdd56b665e80e235087 (commit)
       via  a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc (commit)
       via  a5768442636c7fe909e8afc205fd19ac13b9fbc2 (commit)
      from  6adff767208c2238efb2649395a76bc2ea78fb08 (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=1eb192905d81943073c3cbdd56b665e80e235087
commit 1eb192905d81943073c3cbdd56b665e80e235087
Merge: 6adff76 a41d621
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:26:30 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:26:30 2015 -0500

    Merge topic 'private-FindJsonCpp'
    
    a41d621d bootstrap: Add --(no-)system-jsoncpp options
    a5768442 FindJsonCpp: Drop new module due to upstream jsoncpp providing package


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

Summary of changes:
 CMakeLists.txt                                |    6 ++----
 Help/manual/cmake-modules.7.rst               |    1 -
 Help/module/FindJsonCpp.rst                   |    1 -
 Help/release/3.2.rst                          |    3 ---
 {Modules => Source/Modules}/FindJsonCpp.cmake |    2 +-
 Tests/FindJsonCpp/Test/CMakeLists.txt         |    3 +++
 bootstrap                                     |    6 ++++--
 7 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 Help/module/FindJsonCpp.rst
 rename {Modules => Source/Modules}/FindJsonCpp.cmake (97%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list