osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Detecting these modules finally works on Windows setup 

svn path=/trunk/; revision=52361
This commit is contained in:
Jörg Mayer 2013-10-04 15:10:27 +00:00
parent 319d0fb4d2
commit 325d8315ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/modules/FindGMODULE2.cmake
View File

@ -29,9 +29,9 @@ ELSE()
PKG_SEARCH_MODULE( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0 )
ENDIF()
IF( NOT GMODULE2_FOUND AND NOT PKG_CONFIG_FOUND )
IF( NOT GMODULE2_FOUND )
INCLUDE( FindWSWinLibs )
FindWSWinLibs( "gtk2" "GMODULE2_HINTS" )
FindWSWinLibs( "gtk[23]" "GMODULE2_HINTS" )
FIND_PATH( GMODULE2_INCLUDE_DIRS
NAMES
gmodule.h

4
cmake/modules/FindGTHREAD2.cmake
View File

@ -29,9 +29,9 @@ ELSE()
PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0 )
ENDIF()
IF( NOT GTHREAD2_FOUND AND NOT PKG_CONFIG_FOUND )
IF( NOT GTHREAD2_FOUND )
INCLUDE(FindWSWinLibs)
FindWSWinLibs("gtk2" "GTHREAD2_HINTS")
FindWSWinLibs("gtk[23]" "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" )
IF( APPLE )
FIND_LIBRARY( GTHREAD2_LIBRARIES glib )