diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-04-19 21:48:53 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-04-20 10:46:06 +0000 |
commit | 2b65e9e74bd6156e0ffcb688c58412e9ddf72294 (patch) | |
tree | 3b7d52203d0c72b49ac14fab558e013bfae00a10 /cmake/modules | |
parent | d7583cb713d8d01024174d76891ce61685f00cf7 (diff) |
Windows: upgrade GLib to 2.52.2
Change-Id: If54ec9f8c62d95697a5703ea24cf3ad7c2d6112c
Reviewed-on: https://code.wireshark.org/review/27048
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'cmake/modules')
-rw-r--r-- | cmake/modules/FindGLIB2.cmake | 7 | ||||
-rw-r--r-- | cmake/modules/FindGMODULE2.cmake | 10 | ||||
-rw-r--r-- | cmake/modules/FindGTHREAD2.cmake | 10 |
3 files changed, 3 insertions, 24 deletions
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake index c6324fc240..a86ff01466 100644 --- a/cmake/modules/FindGLIB2.cmake +++ b/cmake/modules/FindGLIB2.cmake @@ -20,12 +20,7 @@ if( GLIB2_MAIN_INCLUDE_DIR AND GLIB2_LIBRARIES ) endif() include( FindWSWinLibs ) - -if( ENABLE_GTK3 ) - FindWSWinLibs( "gtk3" "GLIB2_HINTS" ) -else() - FindWSWinLibs( "gtk2" "GLIB2_HINTS" ) -endif() +FindWSWinLibs( "glib2-*" "GLIB2_HINTS" ) if (NOT WIN32) find_package(PkgConfig) diff --git a/cmake/modules/FindGMODULE2.cmake b/cmake/modules/FindGMODULE2.cmake index 4698ab5af6..98ddc76467 100644 --- a/cmake/modules/FindGMODULE2.cmake +++ b/cmake/modules/FindGMODULE2.cmake @@ -35,15 +35,7 @@ if( GMODULE2_FOUND ) endif() else() include( FindWSWinLibs ) - if( BUILD_wireshark ) - if( ENABLE_GTK3 ) - FindWSWinLibs( "gtk3" "GMODULE2_HINTS" ) - else() - FindWSWinLibs( "gtk2" "GMODULE2_HINTS" ) - endif() - else() - message( ERROR "Unsupported build setup" ) - endif() + FindWSWinLibs( "glib2-*" "GMODULE2_HINTS" ) find_path( GMODULE2_INCLUDE_DIRS NAMES gmodule.h diff --git a/cmake/modules/FindGTHREAD2.cmake b/cmake/modules/FindGTHREAD2.cmake index 9d2f7bd614..3aa75e57d4 100644 --- a/cmake/modules/FindGTHREAD2.cmake +++ b/cmake/modules/FindGTHREAD2.cmake @@ -29,15 +29,7 @@ if( GTHREAD2_FOUND ) endif() else() include( FindWSWinLibs ) - if( BUILD_wireshark ) - if( ENABLE_GTK3 ) - FindWSWinLibs( "gtk3" "GTHREAD2_HINTS" ) - else() - FindWSWinLibs( "gtk2" "GTHREAD2_HINTS" ) - endif() - else() - message( ERROR "Unsupported build setup" ) - endif() + FindWSWinLibs( "glib2-*" "GTHREAD2_HINTS" ) find_path( GTHREAD2_INCLUDE_DIRS gthread.h PATH_SUFFIXES glib-2.0 glib GLib.framework/Headers/glib glib-2.0/glib HINTS "${GTHREAD2_HINTS}/include" ) find_library( GTHREAD2_LIBRARIES gthread-2.0 HINTS "${GTHREAD2_HINTS}/lib" ) if( NOT GTHREAD2_LIBRARIES ) |