osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Undo Graham's change to move find-package down. 

Fix detection of Homebrew on APPLE

Change-Id: I96506bb57d4772c5c90b1117c37e8350cda376ee
Reviewed-on: https://code.wireshark.org/review/2257
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
This commit is contained in:
Joerg Mayer 2014-06-16 20:42:41 +02:00 committed by Jörg Mayer
parent 66532894b0
commit c62d6e5753
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmake/modules/FindGTHREAD2.cmake
View File

@ -21,7 +21,17 @@ else()
set( _pkgconfig_REQUIRED "" )
endif()
if( NOT GTHREAD2_FOUND )
if( GTHREAD2_MIN_VERSION )
PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0>=${GTHREAD2_MIN_VERSION} )
else()
PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0 )
endif()
if( GTHREAD2_FOUND )
if( GMODULE2_LIBRARY_DIRS )
LINK_DIRECTORIES( ${GMODULE2_LIBRARY_DIRS} )
endif()
else()
include( FindWSWinLibs )
if( BUILD_wireshark )
if( ENABLE_GTK3 )
@ -33,19 +43,14 @@ if( NOT GTHREAD2_FOUND )
message( ERROR "Unsupported build setup" )
endif()
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 gthread-2.0 HINTS "${GTHREAD2_HINTS}/lib" )
if( NOT GTHREAD2_LIBRARIES AND APPLE )
# Fallback as APPLE glib libs already contain this - except
# Homebrew which needs the non-Apple setup
find_library( GTHREAD2_LIBRARIES glib )
else()
find_library( GTHREAD2_LIBRARIES gthread-2.0 HINTS "${GTHREAD2_HINTS}/lib" )
endif()
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( GTHREAD2 DEFAULT_MSG GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS )
endif()
if( GTHREAD2_MIN_VERSION )
PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0>=${GTHREAD2_MIN_VERSION} )
else()
PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0 )
endif()
mark_as_advanced( GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS )