Commit Graph

15 Commits

Author SHA1 Message Date
Brad King
b3cb1c6cc3 jsoncpp: Drop deprecation markup
Apply the change from commit 0a0f71066f (jsoncpp: Drop deprecation
markup, 2017-08-28, v3.10.0-rc1~199^2~3) to new markup instances.
2022-01-12 17:42:14 -05:00
Brad King
33fae4cd7a Merge branch 'upstream-jsoncpp' into update-jsoncpp
* upstream-jsoncpp:
  jsoncpp 2022-01-12 (42e892d9)
2022-01-12 17:05:54 -05:00
Brad King
d7dfb84f89 Merge branch 'upstream-jsoncpp' into update-jsoncpp
* upstream-jsoncpp:
  jsoncpp 2020-09-25 (9059f5ca)
2021-09-09 16:20:13 -04:00
Zsolt Parragi
4fe34b2d29 Fixing warnings generated by clang 8.0 on Windows
* Deprecation removals previously specific to MSVC/Intel now also used
  by clang
* String literals were assigned to non const pointers. These are stored
  in mutable arrays now
* An implicit function pointer to pointer conversion is a Microsoft
  extension warning is suppressed by an explicit reinterpret_cast
* The MSVC specific deprecation macro for jsoncpp was moved after the
  clang macro to avoid redefinition warnings. This is consistent with
  how jsoncpp fixed the issue in 36d8cfd7
2019-05-29 18:18:09 +02:00
Brad King
d9d285c5ad jsoncpp: Fix include order for build within CMake
Include the KWSys `Configure.h` header first to get its large file
support definitions before including system headers.
2019-02-25 08:26:20 -05:00
Brad King
73ed503ed5 jsoncpp: Drop doxygen comments not recognized by Clang
Some Clang versions warn with `-Wdocumentation-unknown-command` about
the `\internal` and `\snippet` command tag names.
2017-08-30 10:17:21 -04:00
Brad King
c103a959d1 jsoncpp: Fix compilation on SunPro
The SunPro compiler does not support `#pragma pack`.
2017-08-30 10:17:13 -04:00
Brad King
0a0f71066f jsoncpp: Drop deprecation markup
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.
2017-08-30 10:17:09 -04:00
Brad King
e09819557f Merge branch 'upstream-jsoncpp' into update-jsoncpp
* upstream-jsoncpp:
  jsoncpp 2017-08-27 (4cfae897)
2017-08-30 10:16:59 -04:00
Brad King
a02fbec5f3 jsoncpp: Drop doxygen comments that cause Clang warnings
Even though we disable warnings when building jsoncpp itself, including
its headers from other CMake sources may still cause warnings.  Update
the code to remove these -Wdocumentation warnings.
2015-01-20 09:28:28 -05:00
Brad King
ad94b0521e jsoncpp: Add missing <iosfwd> include in json/writer.h
The header uses std::ostream, so it must be declared.
2015-01-15 11:39:03 -05:00
Brad King
06f41e986c jsoncpp: Disable warnings to avoid changing 3rd party code
Add '-w' or equivalent flag on compilers supporting it.
Tell MSVC to use its lowest warning level inside jsoncpp sources.
2015-01-15 11:39:01 -05:00
Brad King
1fc556536e jsoncpp: Build the library within CMake
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.
2015-01-15 11:37:17 -05:00
Brad King
84d5674d4e jsoncpp: Include "config.h" before system headers 2015-01-15 11:36:49 -05:00
Brad King
a263d519ff Merge branch 'jsoncpp-upstream' into import-jsoncpp
Use a subtree merge to place the upstream content in the
Utilities/cmjsoncpp directory.
2015-01-13 14:42:00 -05:00