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

Undo Graham's change to find the "correct" fix 

Change-Id: Ifc368687da972231298ab5935d071a84edd3e56e
Reviewed-on: https://code.wireshark.org/review/2261
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
This commit is contained in:
Joerg Mayer 2014-06-16 20:51:33 +02:00 committed by Jörg Mayer
parent c607a3fa57
commit caf5e59001
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/modules/FindGLIB2.cmake
View File

@ -35,6 +35,12 @@ else()
set( _pkgconfig_REQUIRED "" )
endif()
if( GLIB2_MIN_VERSION )
pkg_search_module( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0>=${GLIB2_MIN_VERSION} )
else()
pkg_search_module( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0 )
endif()
find_path( GLIB2_MAIN_INCLUDE_DIR
NAMES
glib.h
@ -101,11 +107,5 @@ else()
set( GLIB2_MAIN_INCLUDE_DIRS )
endif()
if( GLIB2_MIN_VERSION )
pkg_search_module( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0>=${GLIB2_MIN_VERSION} )
else()
pkg_search_module( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0 )
endif()
mark_as_advanced( GLIB2_INCLUDE_DIRS GLIB2_LIBRARIES )