diff options
| author | Philip Lowman <philip@yhbt.com> | 2010-01-05 04:07:39 (GMT) |
|---|---|---|
| committer | Philip Lowman <philip@yhbt.com> | 2010-01-05 04:07:39 (GMT) |
| commit | 820e255312eec17a19d360e18fc459b205cf1c72 (patch) | |
| tree | d93228a7b3c9b3bc82162733db80a11a10d767a9 /Modules | |
| parent | cbfbb86b581643db8c1317b07d64743bd1c8a100 (diff) | |
| download | CMake-820e255312eec17a19d360e18fc459b205cf1c72.zip CMake-820e255312eec17a19d360e18fc459b205cf1c72.tar.gz CMake-820e255312eec17a19d360e18fc459b205cf1c72.tar.bz2 | |
Should get FindGTK2 working with fink on Mac OSX
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindGTK2.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 39beae9..c871417 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/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 @@ -167,6 +170,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 +282,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 +392,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) |