diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-06-16 20:51:33 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-06-16 18:52:12 +0000 |
| commit | caf5e59001e4cd2bd37d83eb601c279fdb68f7d6 (patch) | |
| tree | ae8d77ecb8f5a252e080c0121ea7cc93477c2a5e /cmake/modules/FindGLIB2.cmake | |
| parent | c607a3fa578d94464c6bc422b3940557555591fe (diff) | |
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>
Diffstat (limited to 'cmake/modules/FindGLIB2.cmake')
| -rw-r--r-- | cmake/modules/FindGLIB2.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake index a500684949..30fd04d45e 100644 --- a/cmake/modules/FindGLIB2.cmake +++ b/cmake/modules/FindGLIB2.cmake @@ -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 ) |