Graham Bloice

- Using gtk[23] is a hack. Implement a clean solution.

Me
- In the current setup, building Qt ONLY is not supported as
  lots of required support libraries are only found in gtk2 and
  gtk3. Print an error in that case.
- Small style changes (lowercasing, whitespace)

svn path=/trunk/; revision=53692

3 files changed, 73 insertions, 49 deletions

diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake
index 939fe0aaa8..7e603997b9 100644
--- a/cmake/modules/FindGLIB2.cmake
+++ b/cmake/modules/FindGLIB2.cmake
@@ -16,11 +16,19 @@
 
 if( GLIB2_MAIN_INCLUDE_DIR AND GLIB2_LIBRARIES )
 	# Already in cache, be silent
-	set(GLIB2_FIND_QUIETLY TRUE)
+	set( GLIB2_FIND_QUIETLY TRUE )
 endif()
 
 include( FindWSWinLibs )
-FindWSWinLibs( "gtk[23]" "GLIB2_HINTS" )
+if( BUILD_wireshark )
+	if( ENABLE_GTK3 )
+		FindWSWinLibs( "gtk3" "GLIB2_HINTS" )
+	else()
+		FindWSWinLibs( "gtk2" "GLIB2_HINTS" )
+	endif()
+else()
+	message( ERROR "Unsupported build setup" )
+endif()
 
 find_package( PkgConfig )
 if( GLIB2_FIND_REQUIRED )
@@ -72,7 +80,7 @@ find_library( GLIB2_LIBRARY
 # search the glibconfig.h include dir under the same root where the library is found
 get_filename_component( glib2LibDir "${GLIB2_LIBRARY}" PATH)
 
-find_path(GLIB2_INTERNAL_INCLUDE_DIR
+find_path( GLIB2_INTERNAL_INCLUDE_DIR
 	NAMES
 		glibconfig.h
 	HINTS
diff --git a/cmake/modules/FindGMODULE2.cmake b/cmake/modules/FindGMODULE2.cmake
index aedc71b14d..066c695abc 100644
--- a/cmake/modules/FindGMODULE2.cmake
+++ b/cmake/modules/FindGMODULE2.cmake
@@ -15,24 +15,32 @@
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
-INCLUDE( FindPkgConfig )
+include( FindPkgConfig )
 
-IF( GMODULE2_FIND_REQUIRED )
-	SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE()
-	SET( _pkgconfig_REQUIRED "" )
-ENDIF()
+if( GMODULE2_FIND_REQUIRED )
+	set( _pkgconfig_REQUIRED "REQUIRED" )
+else()
+	set( _pkgconfig_REQUIRED "" )
+endif()
 
-IF( GMODULE2_MIN_VERSION )
-	PKG_SEARCH_MODULE( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0>=${GMODULE2_MIN_VERSION} )
-ELSE()
-	PKG_SEARCH_MODULE( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0 )
-ENDIF()
+if( GMODULE2_MIN_VERSION )
+	pkg_search_module( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0>=${GMODULE2_MIN_VERSION} )
+else()
+	pkg_search_module( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0 )
+endif()
 
-IF( NOT GMODULE2_FOUND  )
-	INCLUDE( FindWSWinLibs )
-	FindWSWinLibs( "gtk[23]" "GMODULE2_HINTS" )
-	FIND_PATH( GMODULE2_INCLUDE_DIRS
+if( NOT GMODULE2_FOUND  )
+	include( FindWSWinLibs )
+	if( BUILD_wireshark )
+		if( ENABLE_GTK3 )
+			FindWSWinLibs( "gtk3" "GMODULE2_HINTS" )
+		else()
+			FindWSWinLibs( "gtk2" "GMODULE2_HINTS" )
+		endif()
+	else()
+		message( ERROR "Unsupported build setup" )
+	endif()
+	find_path( GMODULE2_INCLUDE_DIRS
 		NAMES
 			gmodule.h
 		PATH_SUFFIXES
@@ -40,13 +48,13 @@ IF( NOT GMODULE2_FOUND  )
 		HINTS
 			"${GMODULE2_HINTS}/include"
 	)
-	IF( APPLE )
-		FIND_LIBRARY( GMODULE2_LIBRARIES glib )
-	ELSE()
-		FIND_LIBRARY( GMODULE2_LIBRARIES NAMES gmodule-2.0 gmodule HINTS "${GMODULE2_HINTS}/lib" )
-	ENDIF()
-	INCLUDE( FindPackageHandleStandardArgs )
-	FIND_PACKAGE_HANDLE_STANDARD_ARGS( GMODULE2 DEFAULT_MSG GMODULE2_LIBRARIES GMODULE2_INCLUDE_DIRS )
-ENDIF()
+	if( APPLE )
+		find_library( GMODULE2_LIBRARIES glib )
+	else()
+		find_library( GMODULE2_LIBRARIES NAMES gmodule-2.0 gmodule HINTS "${GMODULE2_HINTS}/lib" )
+	endif()
+	include( FindPackageHandleStandardArgs )
+	find_package_handle_standard_args( GMODULE2 DEFAULT_MSG GMODULE2_LIBRARIES GMODULE2_INCLUDE_DIRS )
+endif()
 
-MARK_AS_ADVANCED( GMODULE2_LIBRARIES GMODULE2_INCLUDE_DIRS )
+mark_as_advanced( GMODULE2_LIBRARIES GMODULE2_INCLUDE_DIRS )
diff --git a/cmake/modules/FindGTHREAD2.cmake b/cmake/modules/FindGTHREAD2.cmake
index ae5a7a45a1..10a35fc99e 100644
--- a/cmake/modules/FindGTHREAD2.cmake
+++ b/cmake/modules/FindGTHREAD2.cmake
@@ -15,31 +15,39 @@
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
-INCLUDE( FindPkgConfig )
+include( FindPkgConfig )
 
-IF( GTHREAD2_FIND_REQUIRED )
-	SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE()
-	SET( _pkgconfig_REQUIRED "" )
-ENDIF()
+if( GTHREAD2_FIND_REQUIRED )
+	set( _pkgconfig_REQUIRED "REQUIRED" )
+else()
+	set( _pkgconfig_REQUIRED "" )
+endif()
 
-IF( GTHREAD2_MIN_VERSION )
+if( GTHREAD2_MIN_VERSION )
 	PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0>=${GTHREAD2_MIN_VERSION} )
-ELSE()
+else()
 	PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0 )
-ENDIF()
+endif()
 
-IF( NOT GTHREAD2_FOUND )
-	INCLUDE(FindWSWinLibs)
-	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 )
-	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( NOT GTHREAD2_FOUND )
+	include( FindWSWinLibs )
+	if( BUILD_wireshark )
+		if( ENABLE_GTK3 )
+			FindWSWinLibs( "gtk3" "GMODULE2_HINTS" )
+		else()
+			FindWSWinLibs( "gtk2" "GMODULE2_HINTS" )
+		endif()
+	else()
+		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 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()
 
-MARK_AS_ADVANCED( GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS )
+mark_as_advanced( GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS )