[Cmake-commits] CMake branch, next, updated. v2.8.2-669-g6d408a8

[Philip Lowman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6d408a88cdb92ed95052f0e9ed8bc4826c76462a (commit)
       via  c1675951a013aadbdc472d323c4ff4efb80a09fa (commit)
       via  f68c08e1b4ebf5e7bfd996769866a26833d00121 (commit)
      from  1c1cdcca2d2b51c4d4e0ce81dd18d66f44668e89 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d408a88cdb92ed95052f0e9ed8bc4826c76462a
commit 6d408a88cdb92ed95052f0e9ed8bc4826c76462a
Merge: 1c1cdcc c167595
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Fri Sep 3 22:15:16 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 3 22:15:16 2010 -0400

    Merge topic '11186' into next
    
    c167595 Merge patch for detecting gdk-pixbuf library
    f68c08e KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1675951a013aadbdc472d323c4ff4efb80a09fa
commit c1675951a013aadbdc472d323c4ff4efb80a09fa
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Fri Sep 3 22:05:09 2010 -0400
Commit:     Philip Lowman <philip at yhbt.com>
CommitDate: Fri Sep 3 22:05:09 2010 -0400

    Merge patch for detecting gdk-pixbuf library
    
    The gdk-pixbuf library was split off from core GTK in 2.21 so it could be used
    separately by people outside GTK.  Now FindGTK searches and adds it to the
    library/include list.  Thanks to Vincent Untz for the patch and Ricardo Cruz
    for the heads up.

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 4f341e7..e437e1c 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -66,6 +66,10 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
+# Version 1.2 (8/30/2010) (CMake 2.8.3)
+#   * Merge patch for detecting gdk-pixbuf library (split off
+#     from core GTK in 2.21).  Thanks to Vincent Untz for the patch
+#     and Ricardo Cruz for the heads up.
 # Version 1.1 (8/19/2010) (CMake 2.8.3)
 #   * Add support for detecting GTK2 under macports (thanks to Gary Kramlich)
 # Version 1.0 (8/12/2010) (CMake 2.8.3)
@@ -152,6 +156,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
         atkmm-1.6
         cairo
         cairomm-1.0
+        gdk-pixbuf-2.0
         gdkmm-2.4
         giomm-2.4
         gtk-2.0
@@ -419,6 +424,9 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
         _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_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h)
+        _GTK2_FIND_LIBRARY    (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true)
+
         _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h)
         _GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h)
         _GTK2_FIND_INCLUDE_DIR(GTK2_GTK_INCLUDE_DIR gtk/gtk.h)
@@ -442,9 +450,6 @@ 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)
 
     elseif(_GTK2_component STREQUAL "gtkmm")
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindGTK2.cmake            |   11 ++++++++---
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake