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 0f736f09a391fca1eeebce3d5d0257e28d2ab187 (commit)
via 508e8ca024e47baea342da85c7bbd014c7fd6c30 (commit)
via 8dca8cee8afcaa448e8a83e193017d3514e80da5 (commit)
from 6ae9c417a348009a46f143f7f7ff5d2752e52ffb (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=0f736f09a391fca1eeebce3d5d0257e28d2ab187
commit 0f736f09a391fca1eeebce3d5d0257e28d2ab187
Merge: 6ae9c41 508e8ca
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jun 20 08:53:25 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jun 20 08:53:25 2013 -0400
Merge topic 'FindGTK2-tweaks' into next
508e8ca FindGTK2: Detect gthread library
8dca8ce FindGTK2: Move check for pangocairo in gtk module
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=508e8ca024e47baea342da85c7bbd014c7fd6c30
commit 508e8ca024e47baea342da85c7bbd014c7fd6c30
Author: Daniele E. Domenichelli <ddomeniche...@kde.org>
AuthorDate: Mon Jun 17 17:31:10 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Wed Jun 19 23:58:47 2013 +0200
FindGTK2: Detect gthread library
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 9d0f17f..f398c79 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -164,6 +164,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
cairo
cairomm-1.0
gdk-pixbuf-2.0
+ gthread-2.0
gdkmm-2.4
giomm-2.4
gtk-2.0
@@ -465,6 +466,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_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_LIBRARY (GTK2_GTHREAD_LIBRARY gthread false true)
+
_GTK2_FIND_LIBRARY (GTK2_GIO_LIBRARY gio false true)
_GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dca8cee8afcaa448e8a83e193017d3514e80da5
commit 8dca8cee8afcaa448e8a83e193017d3514e80da5
Author: Daniele E. Domenichelli <ddomeniche...@kde.org>
AuthorDate: Sat Jun 15 00:53:56 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Wed Jun 19 23:58:47 2013 +0200
FindGTK2: Move check for pangocairo in gtk module
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 06cf962..9d0f17f 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -460,6 +460,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_INCLUDE_DIR(GTK2_PANGO_INCLUDE_DIR pango/pango.h)
_GTK2_FIND_LIBRARY (GTK2_PANGO_LIBRARY pango false true)
+ _GTK2_FIND_LIBRARY (GTK2_PANGOCAIRO_LIBRARY pangocairo 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)
@@ -489,8 +491,6 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMMCONFIG_INCLUDE_DIR pangommconfig.h)
_GTK2_FIND_LIBRARY (GTK2_PANGOMM_LIBRARY pangomm true true)
- _GTK2_FIND_LIBRARY (GTK2_PANGOCAIRO_LIBRARY pangocairo true true)
-
_GTK2_FIND_INCLUDE_DIR(GTK2_CAIROMM_INCLUDE_DIR cairomm/cairomm.h)
_GTK2_FIND_INCLUDE_DIR(GTK2_CAIROMMCONFIG_INCLUDE_DIR cairommconfig.h)
_GTK2_FIND_LIBRARY (GTK2_CAIROMM_LIBRARY cairomm true true)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTK2.cmake | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
