summaryrefslogtreecommitdiffstats
path: root/Utilities/cmjsoncpp/include/json/config.h
Commit message (Collapse)AuthorAgeFilesLines
* jsoncpp: Drop deprecation markupBrad King2017-08-301-0/+1
| | | | | | | | Even though we disable warnings when building jsoncpp itself, including its headers from other CMake sources may still cause warnings. Additional work will be needed to port CMake to newer jsoncpp interfaces while still supporting jsoncpp 1.0.0. For now, just suppress the markup.
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2017-08-301-30/+105
| | | | | * upstream-jsoncpp: jsoncpp 2017-08-27 (4cfae897)
* jsoncpp: Disable warnings to avoid changing 3rd party codeBrad King2015-01-151-0/+4
| | | | | Add '-w' or equivalent flag on compilers supporting it. Tell MSVC to use its lowest warning level inside jsoncpp sources.
* jsoncpp: Build the library within CMakeBrad King2015-01-151-0/+3
| | | | | | | | | 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/+112
Use a subtree merge to place the upstream content in the Utilities/cmjsoncpp directory.