diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-11-20 03:15:47 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-11-20 05:04:11 +0000 |
| commit | 811d5f7faca8af0fac5ad6b06da871ca9f87cdd7 (patch) | |
| tree | 606fd11b00ebacfb4d5e5416b339ca0d5ffe4b4b /wsutil/CMakeLists.txt | |
| parent | 656cc19fc7de25c3ac7f9d847c37745ccc272247 (diff) | |
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@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wsutil/CMakeLists.txt')
| -rw-r--r-- | wsutil/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 9af601854f..80d8e5d120 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -231,10 +231,6 @@ set(wsutil_LIBS ${GNUTLS_LIBRARIES} ) -IF(HAVE_JSONGLIB) - list(APPEND wsutil_LIBS ${JSONGLIB_LIBRARIES}) -ENDIF() - IF(WIN32) set(wsutil_LIBS ${wsutil_LIBS} "iphlpapi.lib" "ws2_32.lib") ENDIF(WIN32) |