Browse Source

Merge topic 'FindGTK2-gmodule'

7ca5958 FindGTK2: Detect gmodule library
76c72b9 FindGTK2: gthread-2.0 folder does not exist
Brad King 12 years ago
parent
commit
1a88bbf3f0
1 changed files with 3 additions and 1 deletions
  1. 3 1
      Modules/FindGTK2.cmake

+ 3 - 1
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
@@ -178,7 +179,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
@@ -483,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)