diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-01 12:53:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-01 12:53:58 (GMT) |
| commit | 1a88bbf3f06f0858cf6957d80623d43dcd323a22 (patch) | |
| tree | 15abb5d12439cc2dc8e1d1b8b90149003579303e | |
| parent | 0920587b1d343230ac94783135b4e04f4a71526d (diff) | |
| parent | 7ca5958820b7741b251081af66e1cb67af243fd5 (diff) | |
| download | CMake-1a88bbf3f06f0858cf6957d80623d43dcd323a22.zip CMake-1a88bbf3f06f0858cf6957d80623d43dcd323a22.tar.gz CMake-1a88bbf3f06f0858cf6957d80623d43dcd323a22.tar.bz2 | |
Merge topic 'FindGTK2-gmodule'
7ca5958 FindGTK2: Detect gmodule library
76c72b9 FindGTK2: gthread-2.0 folder does not exist
| -rw-r--r-- | Modules/FindGTK2.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 4f522e5..f7d3bf8 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 @@ -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) |