diff options
| author | Přemysl Janouch <p.janouch@gmail.com> | 2010-10-17 13:36:03 +0200 |
|---|---|---|
| committer | Přemysl Janouch <p.janouch@gmail.com> | 2010-10-17 13:36:03 +0200 |
| commit | 25668c20731722316ca78767ca0cddbf04a988a7 (patch) | |
| tree | 1e159c0574e1f3d16d637ff62c8d7e53aa00d32e /cmake | |
| parent | f25062151941b0dfa90fdf4e6023754140b3fbcf (diff) | |
| download | logdiag-25668c20731722316ca78767ca0cddbf04a988a7.tar.gz logdiag-25668c20731722316ca78767ca0cddbf04a988a7.tar.xz logdiag-25668c20731722316ca78767ca0cddbf04a988a7.zip | |
Updated to new GTK+.
FindGTK2.cmake required a change for successful program compilation.
It seems that gdk_pixbuf has been put as a separate library.
The new tools also generate a slightly different version
of marshallers, so I've added it to the tree.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindGTK2.cmake | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/cmake/FindGTK2.cmake b/cmake/FindGTK2.cmake index 39beae9..54274e5 100644 --- a/cmake/FindGTK2.cmake +++ b/cmake/FindGTK2.cmake @@ -64,6 +64,9 @@ # (To distributed this file outside of CMake, substitute the full # License text for the above reference.) +# Version 0.8 (1/4/2010) +# * Get module working under MacOSX fink by adding /sw/include, /sw/lib +# to PATHS and the gobject library # Version 0.7 (3/22/09) # * Checked into CMake CVS # * Added versioning support @@ -144,6 +147,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) pango-1.0 pangomm-1.4 sigc++-2.0 + gdk-pixbuf-2.0 ) set(_suffixes) @@ -167,6 +171,8 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) /opt/gnome/lib /opt/openwin/include /usr/openwin/lib + /sw/include + /sw/lib $ENV{GTKMM_BASEPATH}/include $ENV{GTKMM_BASEPATH}/lib [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include @@ -277,6 +283,7 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) /opt/gnome/lib64 /usr/openwin/lib /usr/openwin/lib64 + /sw/lib $ENV{GTKMM_BASEPATH}/lib [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib @@ -386,10 +393,12 @@ endif() foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) if(_GTK2_component STREQUAL "gtk") - _GTK2_FIND_INCLUDE_DIR(GTK2_GLIB_INCLUDE_DIR glib.h) _GTK2_FIND_INCLUDE_DIR(GTK2_GLIBCONFIG_INCLUDE_DIR glibconfig.h) _GTK2_FIND_LIBRARY (GTK2_GLIB_LIBRARY glib false true) + + _GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h) + _GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true) _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h) _GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h) @@ -409,9 +418,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h) _GTK2_FIND_LIBRARY (GTK2_ATK_LIBRARY atk false true) - #elseif(_GTK2_component STREQUAL "gdk_pixbuf") - #_GTK2_FIND_INCLUDE_DIR(GTK2_GDKPIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) - #_GTK2_FIND_LIBRARY (GTK2_GDKPIXBUF_LIBRARY gdk_pixbuf false true) + _GTK2_FIND_INCLUDE_DIR(GTK2_GDKPIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) + _GTK2_FIND_LIBRARY (GTK2_GDKPIXBUF_LIBRARY gdk_pixbuf false true) elseif(_GTK2_component STREQUAL "gtkmm") |