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 52369f40a223797f8682717de3210975d12c90ad (commit) via 17a53c7381a324f805ad091884cd23477e633bc6 (commit) via bb024f2117bbe7e2bd2bc17f5c30dfb51a2f3033 (commit) from 432d10286bdc96c73a5740d6ef2e168f13d9a277 (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=52369f40a223797f8682717de3210975d12c90ad commit 52369f40a223797f8682717de3210975d12c90ad Merge: 432d102 17a53c7 Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com> AuthorDate: Wed Sep 25 09:10:05 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Sep 25 09:10:05 2013 -0400 Merge topic 'FindGTK2-targets' into next 17a53c7 FindGTK2: Do not use methods not available in older GTK2 version in tests bb024f2 FindGTK2: do not skip target creation if optional dependencies are not found http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a53c7381a324f805ad091884cd23477e633bc6 commit 17a53c7381a324f805ad091884cd23477e633bc6 Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it> AuthorDate: Wed Sep 25 15:07:30 2013 +0200 Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it> CommitDate: Wed Sep 25 15:07:30 2013 +0200 FindGTK2: Do not use methods not available in older GTK2 version in tests diff --git a/Tests/FindGTK2/atk/main.c b/Tests/FindGTK2/atk/main.c index 573a313..e25030e 100644 --- a/Tests/FindGTK2/atk/main.c +++ b/Tests/FindGTK2/atk/main.c @@ -2,8 +2,6 @@ int main(int argc, char *argv[]) { - guint major = atk_get_major_version(); - guint minor = atk_get_minor_version(); - guint micro = atk_get_micro_version(); + const gchar *name = atk_get_toolkit_name(); return 0; } diff --git a/Tests/FindGTK2/glibmm/main.cpp b/Tests/FindGTK2/glibmm/main.cpp index 973a22a..0e8cdae 100644 --- a/Tests/FindGTK2/glibmm/main.cpp +++ b/Tests/FindGTK2/glibmm/main.cpp @@ -1,84 +1,7 @@ -// Taken from https://developer.gnome.org/glibmm/unstable/thread_2thread_8cc-example.html - - -#include <iostream> -#include <queue> -#include <glibmm/threads.h> -#include <glibmm/random.h> -#include <glibmm/timer.h> #include <glibmm/init.h> -namespace -{ -class MessageQueue -{ -public: - MessageQueue(); - ~MessageQueue(); - void producer(); - void consumer(); -private: - Glib::Threads::Mutex mutex_; - Glib::Threads::Cond cond_push_; - Glib::Threads::Cond cond_pop_; - std::queue<int> queue_; -}; -MessageQueue::MessageQueue() -{} -MessageQueue::~MessageQueue() -{} -void MessageQueue::producer() -{ - Glib::Rand rand (1234); - for(int i = 0; i < 200; ++i) - { - { - Glib::Threads::Mutex::Lock lock (mutex_); - while(queue_.size() >= 64) - cond_pop_.wait(mutex_); - queue_.push(i); - std::cout << '*'; - std::cout.flush(); - cond_push_.signal(); - } - if(rand.get_bool()) - continue; - Glib::usleep(rand.get_int_range(0, 100000)); - } -} -void MessageQueue::consumer() -{ - Glib::Rand rand (4567); - for(;;) - { - { - Glib::Threads::Mutex::Lock lock (mutex_); - while(queue_.empty()) - cond_push_.wait(mutex_); - const int i = queue_.front(); - queue_.pop(); - std::cout << "\x08 \x08"; - std::cout.flush(); - cond_pop_.signal(); - if(i >= 199) - break; - } - if(rand.get_bool()) - continue; - Glib::usleep(rand.get_int_range(10000, 200000)); - } -} -} int main(int, char**) { Glib::init(); - MessageQueue queue; - Glib::Threads::Thread *const producer = Glib::Threads::Thread::create( - sigc::mem_fun(queue, &MessageQueue::producer)); - Glib::Threads::Thread *const consumer = Glib::Threads::Thread::create( - sigc::mem_fun(queue, &MessageQueue::consumer)); - producer->join(); - consumer->join(); - std::cout << std::endl; return 0; } diff --git a/Tests/FindGTK2/gthread/main.c b/Tests/FindGTK2/gthread/main.c index cf470ac..ce68cbd 100644 --- a/Tests/FindGTK2/gthread/main.c +++ b/Tests/FindGTK2/gthread/main.c @@ -1,13 +1,7 @@ #include <glib.h> -gpointer func(gpointer data) { - return NULL; -} - int main(int argc, char *argv[]) { g_thread_init(NULL); - GThread *thread = g_thread_new("thread", func, NULL); - g_thread_join(thread); return 0; } diff --git a/Tests/FindGTK2/pango/main.c b/Tests/FindGTK2/pango/main.c index 3e6ea05..ef87ce4 100644 --- a/Tests/FindGTK2/pango/main.c +++ b/Tests/FindGTK2/pango/main.c @@ -2,6 +2,6 @@ int main(int argc, char *argv[]) { - int version = pango_version(); + gboolean ret = pango_color_parse(NULL, "#ffffff"); return 0; } http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb024f2117bbe7e2bd2bc17f5c30dfb51a2f3033 commit bb024f2117bbe7e2bd2bc17f5c30dfb51a2f3033 Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it> AuthorDate: Wed Sep 25 15:06:14 2013 +0200 Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it> CommitDate: Wed Sep 25 15:06:14 2013 +0200 FindGTK2: do not skip target creation if optional dependencies are not found On some older GTK2 version gio, giomm and cairomm are not available diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 7027811..4459c78 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -457,7 +457,7 @@ function(_GTK2_ADD_TARGET _var) string(TOLOWER "${_var}" _basename) - cmake_parse_arguments(_${_var} "" "" "GTK2_DEPENDS;EXTRA_INCLUDES" ${ARGN}) + cmake_parse_arguments(_${_var} "" "" "GTK2_DEPENDS;GTK2_OPTIONAL_DEPENDS;EXTRA_INCLUDES" ${ARGN}) # Do not create the target if dependencies are missing foreach(_dep ${_${_var}_GTK2_DEPENDS}) @@ -498,7 +498,7 @@ function(_GTK2_ADD_TARGET _var) endif() if(_${_var}_GTK2_DEPENDS) - _GTK2_ADD_TARGET_DEPENDS(${_var} ${_${_var}_GTK2_DEPENDS}) + _GTK2_ADD_TARGET_DEPENDS(${_var} ${_${_var}_GTK2_DEPENDS} ${_${_var}_GTK2_OPTIONAL_DEPENDS}) endif() if(_${_var}_EXTRA_INCLUDES) @@ -665,7 +665,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) else() _GTK2_FIND_LIBRARY (GTK gtk-win32 false true) endif() - _GTK2_ADD_TARGET (GTK GTK2_DEPENDS gdk atk gio pangoft2 pangocairo pango cairo gdk_pixbuf gthread gobject glib) + _GTK2_ADD_TARGET (GTK GTK2_DEPENDS gdk atk pangoft2 pangocairo pango cairo gdk_pixbuf gthread gobject glib + GTK2_OPTIONAL_DEPENDS gio) # Left for compatibility with previous versions. It doesn't seem to be required _GTK2_FIND_INCLUDE_DIR(FONTCONFIG fontconfig/fontconfig.h) @@ -700,20 +701,23 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_INCLUDE_DIR(PANGOMM pangomm.h) _GTK2_FIND_INCLUDE_DIR(PANGOMMCONFIG pangommconfig.h) _GTK2_FIND_LIBRARY (PANGOMM pangomm true true) - _GTK2_ADD_TARGET (PANGOMM GTK2_DEPENDS glibmm cairomm pangocairo sigc++ pango cairo gobject glib + _GTK2_ADD_TARGET (PANGOMM GTK2_DEPENDS glibmm pangocairo sigc++ pango cairo gobject glib + GTK2_OPTIONAL_DEPENDS cairomm EXTRA_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}) _GTK2_FIND_INCLUDE_DIR(GDKMM gdkmm.h) _GTK2_FIND_INCLUDE_DIR(GDKMMCONFIG gdkmmconfig.h) _GTK2_FIND_LIBRARY (GDKMM gdkmm true true) - _GTK2_ADD_TARGET (GDKMM GTK2_DEPENDS giomm pangomm gtk glibmm cairomm sigc++ gdk atk gio pangoft2 pangocairo gdk_pixbuf cairo pango gobject glib + _GTK2_ADD_TARGET (GDKMM GTK2_DEPENDS pangomm gtk glibmm sigc++ gdk atk pangoft2 pangocairo gdk_pixbuf cairo pango gobject glib + GTK2_OPTIONAL_DEPENDS giomm cairomm gio EXTRA_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}) _GTK2_FIND_INCLUDE_DIR(GTKMM gtkmm.h) _GTK2_FIND_INCLUDE_DIR(GTKMMCONFIG gtkmmconfig.h) _GTK2_FIND_LIBRARY (GTKMM gtkmm true true) - _GTK2_ADD_TARGET (GTKMM GTK2_DEPENDS atkmm gdkmm giomm pangomm gtk glibmm cairomm sigc++ gdk atk gio pangoft2 pangocairo gdk_pixbuf cairo pango gthread gobject glib + _GTK2_ADD_TARGET (GTKMM GTK2_DEPENDS atkmm gdkmm pangomm gtk glibmm sigc++ gdk atk pangoft2 pangocairo gdk_pixbuf cairo pango gthread gobject glib + GTK2_OPTIONAL_DEPENDS giomm cairomm gio EXTRA_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}) elseif(_GTK2_component STREQUAL "glade") @@ -728,7 +732,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_INCLUDE_DIR(GLADEMM libglademm.h) _GTK2_FIND_INCLUDE_DIR(GLADEMMCONFIG libglademmconfig.h) _GTK2_FIND_LIBRARY (GLADEMM glademm true true) - _GTK2_ADD_TARGET (GLADEMM GTK2_DEPENDS gtkmm glade atkmm gdkmm giomm pangomm glibmm cairomm sigc++ gtk gdk atk gio pangoft2 pangocairo gdk_pixbuf cairo pango gthread gobject glib + _GTK2_ADD_TARGET (GLADEMM GTK2_DEPENDS gtkmm glade atkmm gdkmm giomm pangomm glibmm sigc++ gtk gdk atk pangoft2 pangocairo gdk_pixbuf cairo pango gthread gobject glib + GTK2_OPTIONAL_DEPENDS giomm cairomm gio EXTRA_INCLUDES ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}) else() ----------------------------------------------------------------------- Summary of changes: Modules/FindGTK2.cmake | 19 ++++++---- Tests/FindGTK2/atk/main.c | 4 +-- Tests/FindGTK2/glibmm/main.cpp | 77 ---------------------------------------- Tests/FindGTK2/gthread/main.c | 6 --- Tests/FindGTK2/pango/main.c | 2 +- 5 files changed, 14 insertions(+), 94 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits