Wireshark · Wireshark-commits: [Wireshark-commits] master b887fd4: CMake: fix build with json-glib with gold linker

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b887fd49196b000b966e60ffc9913b4136a017d6
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

b887fd4 by Peter Wu (peter@xxxxxxxxxxxxx):

    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@xxxxxxxxx>
    Petri-Dish: Dario Lombardo <lomato@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  aae825c   Remove remnants of WS_QT_BIN_PATH
    adds  b887fd4   CMake: fix build with json-glib with gold linker


Summary of changes:
 CMakeLists.txt                   |  5 -----
 cmake/modules/FindGLIB2.cmake    | 21 ++++++++++++++++++++-
 cmake/modules/FindJSONGLIB.cmake |  2 ++
 epan/CMakeLists.txt              |  1 +
 4 files changed, 23 insertions(+), 6 deletions(-)