From 76c72b9f14258933e4cf810da275bd2b931c5ac9 Mon Sep 17 00:00:00 2001 From: "Daniele E. Domenichelli" Date: Wed, 31 Jul 2013 17:37:46 +0200 Subject: [PATCH 1/2] FindGTK2: gthread-2.0 folder does not exist Partially revert commit 508e8ca024e47baea342da85c7bbd014c7fd6c30 --- Modules/FindGTK2.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 4f522e54c..efb1d9f8c 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -178,7 +178,6 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) cairo cairomm-1.0 gdk-pixbuf-2.0 - gthread-2.0 gdkmm-2.4 giomm-2.4 gtk-2.0 From 7ca5958820b7741b251081af66e1cb67af243fd5 Mon Sep 17 00:00:00 2001 From: "Daniele E. Domenichelli" Date: Wed, 31 Jul 2013 17:40:07 +0200 Subject: [PATCH 2/2] FindGTK2: Detect gmodule library --- Modules/FindGTK2.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index efb1d9f8c..f7d3bf856 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -77,6 +77,7 @@ # appropriate. A new set of _RELEASE variables was also added. # * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are # marked as advanced by SelectLibraryConfigurations +# * Detect gmodule library # Version 1.4 (10/4/2012) (CMake 2.8.10) # * 12596: Missing paths for FindGTK2 on NetBSD # * 12049: Fixed detection of GTK include files in the lib folder on @@ -482,6 +483,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_LIBRARY (GTK2_GTHREAD gthread false true) + _GTK2_FIND_LIBRARY (GTK2_GMODULE gmodule false true) + _GTK2_FIND_LIBRARY (GTK2_GIO gio false true) _GTK2_FIND_INCLUDE_DIR(GTK2_ATK atk/atk.h)