[Cmake-commits] [cmake-commits] lowman committed FindGTK2.cmake 1.3 1.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv19294

Modified Files:
	FindGTK2.cmake 
Log Message:
Should get FindGTK2 working with fink on Mac OSX


Index: FindGTK2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGTK2.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** FindGTK2.cmake	28 Sep 2009 15:45:33 -0000	1.3
--- FindGTK2.cmake	5 Jan 2010 04:07:39 -0000	1.4
***************
*** 65,68 ****
--- 65,71 ----
  #  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
***************
*** 168,171 ****
--- 171,176 ----
              /opt/openwin/include
              /usr/openwin/lib
+             /sw/include
+             /sw/lib
              $ENV{GTKMM_BASEPATH}/include
              $ENV{GTKMM_BASEPATH}/lib
***************
*** 278,281 ****
--- 283,287 ----
              /usr/openwin/lib
              /usr/openwin/lib64
+             /sw/lib
              $ENV{GTKMM_BASEPATH}/lib
              [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
***************
*** 387,394 ****
  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_GDK_INCLUDE_DIR gdk/gdk.h)
--- 393,402 ----
  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)