[Cmake-commits] CMake branch, master, updated. v3.1.0-817-g9d4ef58

Brad King brad.king at kitware.com
Fri Jan 16 09:43:53 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  9d4ef584626c4efc882f362e7d46e9b2d8c66045 (commit)
       via  89cd3d273deadf0b6a1c6b0dc8db153572e75845 (commit)
       via  7e310624b0973b8f0c529837010f164e486e784e (commit)
       via  4c49606598ab3089f0cec9be724ae2f3ab4c1ba3 (commit)
       via  50032bc847a79dc209e6e1ae4dd77a2ec2d52be9 (commit)
       via  ad94b0521eb3a0e05c120b510d047dd18b27c9df (commit)
       via  7eba04fda156f670f8c84f3d6a9d9b44a472a04a (commit)
       via  06f41e986c25fc2fd68074fce314a55f5c1d003d (commit)
       via  1fc556536e0c0475d401e8b5747b46e9f7c32287 (commit)
       via  84d5674d4e0cfe30f28db2893ad00937deece57c (commit)
       via  a263d519fffab082fc31f8e3f454726e3fbd8363 (commit)
       via  53f6ccb0ee76a2b9ac40abd5ec5e07aa55fbb393 (commit)
       via  32fd56b066c28758e31ae97d4b16216b3633a843 (commit)
      from  cc475e812949b1824ba7bbf7dd1a417a0962b77b (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=9d4ef584626c4efc882f362e7d46e9b2d8c66045
commit 9d4ef584626c4efc882f362e7d46e9b2d8c66045
Merge: cc475e8 89cd3d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 16 09:43:52 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 16 09:43:52 2015 -0500

    Merge topic 'import-jsoncpp'
    
    89cd3d27 jsoncpp: Add README-CMake.txt
    7e310624 jsoncpp: Provide 'isfinite' implementation on Solaris
    4c496065 jsoncpp: Provide 'isfinite' implementation on ancient glibc
    50032bc8 jsoncpp: Add missing assert before strcmp in json_value.cpp
    ad94b052 jsoncpp: Add missing <iosfwd> include in json/writer.h
    7eba04fd jsoncpp: Include C headers since we use APIs without std::
    06f41e98 jsoncpp: Disable warnings to avoid changing 3rd party code
    1fc55653 jsoncpp: Build the library within CMake
    84d5674d jsoncpp: Include "config.h" before system headers
    a263d519 Merge branch 'jsoncpp-upstream' into import-jsoncpp
    53f6ccb0 JsonCpp 1.0.0 (reduced)
    32fd56b0 jsoncpp: Add .gitattributes to skip whitespace checks


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

Summary of changes:
 CMakeLists.txt                                     |    5 +
 Utilities/cm_jsoncpp_reader.h                      |   18 +
 Utilities/{cmcurl => cmjsoncpp}/.gitattributes     |    0
 Utilities/cmjsoncpp/CMakeLists.txt                 |   25 +
 Utilities/cmjsoncpp/LICENSE                        |   55 +
 Utilities/cmjsoncpp/README-CMake.txt               |   66 +
 Utilities/cmjsoncpp/include/json/assertions.h      |   41 +
 Utilities/cmjsoncpp/include/json/config.h          |  119 ++
 Utilities/cmjsoncpp/include/json/features.h        |   57 +
 Utilities/cmjsoncpp/include/json/forwards.h        |   43 +
 Utilities/cmjsoncpp/include/json/json.h            |   14 +
 Utilities/cmjsoncpp/include/json/reader.h          |  276 ++++
 Utilities/cmjsoncpp/include/json/value.h           | 1088 ++++++++++++++
 Utilities/cmjsoncpp/include/json/version.h         |   14 +
 Utilities/cmjsoncpp/include/json/writer.h          |  214 +++
 .../cmjsoncpp/src/lib_json/json_batchallocator.h   |  121 ++
 .../cmjsoncpp/src/lib_json/json_internalarray.inl  |  360 +++++
 .../cmjsoncpp/src/lib_json/json_internalmap.inl    |  473 +++++++
 Utilities/cmjsoncpp/src/lib_json/json_reader.cpp   |  885 ++++++++++++
 Utilities/cmjsoncpp/src/lib_json/json_tool.h       |   87 ++
 Utilities/cmjsoncpp/src/lib_json/json_value.cpp    | 1482 ++++++++++++++++++++
 .../cmjsoncpp/src/lib_json/json_valueiterator.inl  |  241 ++++
 Utilities/cmjsoncpp/src/lib_json/json_writer.cpp   |  703 ++++++++++
 23 files changed, 6387 insertions(+)
 create mode 100644 Utilities/cm_jsoncpp_reader.h
 copy Utilities/{cmcurl => cmjsoncpp}/.gitattributes (100%)
 create mode 100644 Utilities/cmjsoncpp/CMakeLists.txt
 create mode 100644 Utilities/cmjsoncpp/LICENSE
 create mode 100644 Utilities/cmjsoncpp/README-CMake.txt
 create mode 100644 Utilities/cmjsoncpp/include/json/assertions.h
 create mode 100644 Utilities/cmjsoncpp/include/json/config.h
 create mode 100644 Utilities/cmjsoncpp/include/json/features.h
 create mode 100644 Utilities/cmjsoncpp/include/json/forwards.h
 create mode 100644 Utilities/cmjsoncpp/include/json/json.h
 create mode 100644 Utilities/cmjsoncpp/include/json/reader.h
 create mode 100644 Utilities/cmjsoncpp/include/json/value.h
 create mode 100644 Utilities/cmjsoncpp/include/json/version.h
 create mode 100644 Utilities/cmjsoncpp/include/json/writer.h
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_batchallocator.h
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_internalarray.inl
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_internalmap.inl
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_reader.cpp
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_tool.h
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_value.cpp
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_valueiterator.inl
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_writer.cpp


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list