kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindGTK2-gmodule' 

7ca5958 FindGTK2: Detect gmodule library
76c72b9 FindGTK2: gthread-2.0 folder does not exist
This commit is contained in:
Brad King 2013-08-01 08:53:58 -04:00 committed by CMake Topic Stage
parent 0920587b1d 7ca5958820
commit 1a88bbf3f0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindGTK2.cmake
View File

@ -77,6 +77,7 @@
# appropriate. A new set of _RELEASE variables was also added. # appropriate. A new set of _RELEASE variables was also added.
# * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are # * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are
# marked as advanced by SelectLibraryConfigurations # marked as advanced by SelectLibraryConfigurations
# * Detect gmodule library
# Version 1.4 (10/4/2012) (CMake 2.8.10) # Version 1.4 (10/4/2012) (CMake 2.8.10)
# * 12596: Missing paths for FindGTK2 on NetBSD # * 12596: Missing paths for FindGTK2 on NetBSD
# * 12049: Fixed detection of GTK include files in the lib folder on # * 12049: Fixed detection of GTK include files in the lib folder on
@ -178,7 +179,6 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
cairo cairo
cairomm-1.0 cairomm-1.0
gdk-pixbuf-2.0 gdk-pixbuf-2.0
gthread-2.0
gdkmm-2.4 gdkmm-2.4
giomm-2.4 giomm-2.4
gtk-2.0 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_GTHREAD gthread false true)
_GTK2_FIND_LIBRARY (GTK2_GMODULE gmodule false true)
_GTK2_FIND_LIBRARY (GTK2_GIO gio false true) _GTK2_FIND_LIBRARY (GTK2_GIO gio false true)
_GTK2_FIND_INCLUDE_DIR(GTK2_ATK atk/atk.h) _GTK2_FIND_INCLUDE_DIR(GTK2_ATK atk/atk.h)