summaryrefslogtreecommitdiffstats
path: root/Utilities/cmjsoncpp/include/json/json.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2021-09-091-2/+3
| | | | | * upstream-jsoncpp: jsoncpp 2020-09-25 (9059f5ca)
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2017-08-301-1/+1
| | | | | * upstream-jsoncpp: jsoncpp 2017-08-27 (4cfae897)
* jsoncpp: Build the library within CMakeBrad King2015-01-151-1/+0
| | | | | | | | | Update json/json.h to account for our lack of autolink.h. Update json/config.h to include KWSys Large File Support configuration so that consistent stream libraries are used (on AIX with XL). Add a cm_jsoncpp_reader.h header to include the CMake-provided copy of the json/reader.h header from CMake sources.
* Merge branch 'jsoncpp-upstream' into import-jsoncppBrad King2015-01-131-0/+15
Use a subtree merge to place the upstream content in the Utilities/cmjsoncpp directory.