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>

2 files changed, 2 insertions, 92 deletions

diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake
index c42a1b1490..77ba381540 100644
--- a/cmake/modules/FindGLIB2.cmake
+++ b/cmake/modules/FindGLIB2.cmake
@@ -66,24 +66,6 @@ find_library( GLIB2_LIBRARY
 		/usr/lib
 )
 
-find_library(GOBJECT_LIBRARY
-	NAMES
-		gobject-2.0
-		gobject-2.0-0
-	HINTS
-		"${GLIB2_LIBDIR}"
-		"${GLIB2_HINTS}/lib"
-	PATHS
-		/opt/gnome/lib64
-		/opt/gnome/lib
-		/opt/lib/
-		/opt/local/lib
-		/sw/lib/
-		/usr/lib64
-		/usr/lib
-)
-
-
 # search the glibconfig.h include dir under the same root where the library is found
 get_filename_component( glib2LibDir "${GLIB2_LIBRARY}" PATH)
 
@@ -105,12 +87,11 @@ include( FindPackageHandleStandardArgs )
 find_package_handle_standard_args( GLIB2
 	DEFAULT_MSG
 	GLIB2_LIBRARY
-	GOBJECT_LIBRARY
 	GLIB2_MAIN_INCLUDE_DIR
 )
 
 if( GLIB2_FOUND )
-	set( GLIB2_LIBRARIES ${GLIB2_LIBRARY} ${GOBJECT_LIBRARY} )
+	set( GLIB2_LIBRARIES ${GLIB2_LIBRARY} )
 	# Include transitive dependencies for static linking.
 	if(UNIX AND CMAKE_FIND_LIBRARY_SUFFIXES STREQUAL ".a")
 		find_library(PCRE_LIBRARY pcre)
@@ -121,6 +102,7 @@ if( GLIB2_FOUND )
 		set ( GLIB2_DLL_DIR "${GLIB2_HINTS}/bin"
 			CACHE PATH "Path to GLib 2 DLLs"
 		)
+		# XXX Are GIO and GObject really necessary?
 		file( GLOB _glib2_dlls RELATIVE "${GLIB2_DLL_DIR}"
 			"${GLIB2_DLL_DIR}/libglib-*.dll"
 			"${GLIB2_DLL_DIR}/libgio-*.dll"
diff --git a/cmake/modules/FindJSONGLIB.cmake b/cmake/modules/FindJSONGLIB.cmake
deleted file mode 100644
index 8135813287..0000000000
--- a/cmake/modules/FindJSONGLIB.cmake
+++ /dev/null
@@ -1,72 +0,0 @@
-# - Try to find JsonGlib-1.0
-# Once done, this will define
-#
-#  JSONGLIB_FOUND - system has Glib
-#  JSONGLIB_INCLUDE_DIRS - the Glib include directories
-#  JSONGLIB_LIBRARIES - link these to use Glib
-#
-# Depends on FindGLIB2.cmake to include the gobject library.
-
-include(FindWSWinLibs)
-FindWSWinLibs("json-glib-*" "JSONGLIB_HINTS")
-
-find_path(JSONGLIB_INCLUDE_DIR
-    NAMES
-      json-glib/json-glib.h
-    HINTS
-      "${JSONGLIB_HINTS}/include"
-    PATHS
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-      ${CMAKE_INCLUDE_PATH}
-      ${CMAKE_INSTALL_PREFIX}/include
-    PATH_SUFFIXES
-      json-glib-1.0
-)
-
-find_library(JSONGLIB_LIBRARY
-    NAMES
-      json-glib-1.0
-      json-glib-1.0-0
-    HINTS
-      "${JSONGLIB_HINTS}/lib"
-    PATHS
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-      ${CMAKE_LIBRARY_PATH}
-      ${CMAKE_INSTALL_PREFIX}/lib
-)
-
-if(WIN32)
-    set(JSONGLIB_DLL_DIR "${JSONGLIB_HINTS}/bin"
-      CACHE PATH "Path to json-glib DLL"
-    )
-    file(GLOB _jsonglib_dll RELATIVE "${JSONGLIB_DLL_DIR}"
-      "${JSONGLIB_DLL_DIR}/libjson-glib-1.0-0.dll"
-    )
-    set(JSONGLIB_DLL ${_jsonglib_dll}
-      # We're storing filenames only. Should we use STRING instead?
-      CACHE FILEPATH "json-glib DLL file name"
-    )
-    mark_as_advanced(JSONGLIB_DLL_DIR JSONGLIB_DLL)
-endif()
-
-if(JSONGLIB_INCLUDE_DIR AND JSONGLIB_LIBRARY)
-    set(JSONGLIB_INCLUDE_DIRS
-      ${JSONGLIB_INCLUDE_DIR}
-    )
-    set(JSONGLIB_LIBRARIES
-      ${JSONGLIB_LIBRARY}
-    )
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set JSONGLIB_FOUND to TRUE if
-# all listed variables are TRUE and the requested version matches.
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(JSONGLIB
-	REQUIRED_VARS   JSONGLIB_LIBRARY JSONGLIB_INCLUDE_DIR)