URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=70d389f325ffd8ce288c70e90bc34bff9a052c15
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark
Commits:
70d389f by Guy Harris (guy@xxxxxxxxxxxx):
Clean up searches for GLib submodules on Windows.
FindWSWinLibs() does nothing on non-Windows platforms; only use it on
Windows.
If we aren't building the GTK+ version of Windows, search for the GLib
modules in gtk3 first, and then gtk2; don't depend on which version of
GTK+ was enabled, as we presumably didn't enable *either* of them.
While we're at it, fix some apparent typoes in FindGTHREAD2.cmake - it
made references to GMODULE2_LIBRARY_DIRS that presumably should have
been references to GTHREAD2_LIBRARY_DIRS.
Change-Id: I418ac71803cfca2fd0ad99014d995241819ddc38
Reviewed-on: https://code.wireshark.org/review/32039
Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from ef5c87e frame: fix crash when dissectors add the maximum number of tree items.
add 70d389f Clean up searches for GLib submodules on Windows.
Summary of changes:
cmake/modules/FindGMODULE2.cmake | 36 +++++++++++++++++++++++++-----------
cmake/modules/FindGTHREAD2.cmake | 40 +++++++++++++++++++++++++++-------------
2 files changed, 52 insertions(+), 24 deletions(-)