diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-04-18 15:35:37 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2018-04-19 08:08:11 +0000 |
| commit | b887fd49196b000b966e60ffc9913b4136a017d6 (patch) | |
| tree | 1b9b7c32f2c0a25909949a9211c5cd8632717577 /cmake/modules/FindJSONGLIB.cmake | |
| parent | aae825cf7757b5fc2690f3ad95344c3d042b982b (diff) | |
CMake: fix build with json-glib with gold linker
JSON-GLIB depends on GObject. To avoid "undefined reference to
'g_object_unref'" with the gold linker, include gobject directly.
As the files are included with the GLib package, adjust FindGLIB2.cmake.
Change-Id: I007d30b89cc07d8746cee6b619832a722f086105
Fixes: v2.9.0rc0-201-g511c2e166a ("tshark: add -G elastic-mapping report.")
Reviewed-on: https://code.wireshark.org/review/27007
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'cmake/modules/FindJSONGLIB.cmake')
| -rw-r--r-- | cmake/modules/FindJSONGLIB.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/modules/FindJSONGLIB.cmake b/cmake/modules/FindJSONGLIB.cmake index 514bbdd6af..1f25f46550 100644 --- a/cmake/modules/FindJSONGLIB.cmake +++ b/cmake/modules/FindJSONGLIB.cmake @@ -4,6 +4,8 @@ # 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("libjson-glib-.*" "JSONGLIB_HINTS") |