diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2014-05-16 20:43:17 +0100 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-06-08 12:13:35 +0000 |
| commit | 561460160a4ae73bda9b92751ae5c35d4324bb87 (patch) | |
| tree | d3fad10ea806f0feca51e6560768216cdecb3f6e /cmake/modules/FindGTHREAD2.cmake | |
| parent | 39cdb98606b821136aabc6d60b2e1ce4846aab8b (diff) | |
| download | wireshark-561460160a4ae73bda9b92751ae5c35d4324bb87.tar.gz | |
Update CMake build for win32 to build QT again, and to find
GLib and GThread libs
Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a
Reviewed-on: https://code.wireshark.org/review/2010
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'cmake/modules/FindGTHREAD2.cmake')
| -rw-r--r-- | cmake/modules/FindGTHREAD2.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/modules/FindGTHREAD2.cmake b/cmake/modules/FindGTHREAD2.cmake index 182df7c2ab..1e2079bc80 100644 --- a/cmake/modules/FindGTHREAD2.cmake +++ b/cmake/modules/FindGTHREAD2.cmake @@ -21,12 +21,6 @@ else() set( _pkgconfig_REQUIRED "" ) 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() - if( NOT GTHREAD2_FOUND ) include( FindWSWinLibs ) if( BUILD_wireshark ) @@ -48,4 +42,10 @@ if( NOT GTHREAD2_FOUND ) 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 ) |