URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=811d5f7faca8af0fac5ad6b06da871ca9f87cdd7
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
811d5f7 by Peter Wu (peter@xxxxxxxxxxxxx):
Drop JSON-GLib completely
JSON-GLib was added in v2.9.0rc0-201-g511c2e166a, but is no longer
necessary since we have a home-grown JSON dumper (wsutil/json_dumper.h).
Remove the remaining traces and additionally remove GObject from
FindGLIB2.cmake since it was only added for JSON-GLib.
Change-Id: If9dfd2c60cec130f98109d100bdb6618bde06ba0
Reviewed-on: https://code.wireshark.org/review/30733
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 656cc19 Replace JSON-GLib by custom JSON dumper library
add 811d5f7 Drop JSON-GLib completely
Summary of changes:
CMakeLists.txt | 8 -----
cmake/modules/FindGLIB2.cmake | 22 ++----------
cmake/modules/FindJSONGLIB.cmake | 72 ----------------------------------------
cmakeconfig.h.in | 3 --
epan/CMakeLists.txt | 1 -
packaging/nsis/CMakeLists.txt | 2 +-
packaging/wix/CMakeLists.txt | 4 +--
tools/bsd-setup.sh | 4 ---
tools/debian-setup.sh | 1 -
tools/macos-setup-brew.sh | 2 +-
tools/macos-setup.sh | 55 +-----------------------------
tools/rpm-setup.sh | 1 -
tools/win-setup.ps1 | 3 --
wsutil/CMakeLists.txt | 4 ---
wsutil/wsjson.c | 10 ------
15 files changed, 7 insertions(+), 185 deletions(-)
delete mode 100644 cmake/modules/FindJSONGLIB.cmake