[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3548-g14668d1

[Daniele E. Domenichelli]

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  14668d1346619005d94b3c1777acb85abb0a4a57 (commit)
       via  7ca5958820b7741b251081af66e1cb67af243fd5 (commit)
       via  76c72b9f14258933e4cf810da275bd2b931c5ac9 (commit)
      from  c57b8d5618a6dd664b932b92c9c87ccc3dbcfed4 (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=14668d1346619005d94b3c1777acb85abb0a4a57
commit 14668d1346619005d94b3c1777acb85abb0a4a57
Merge: c57b8d5 7ca5958
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Wed Jul 31 11:42:35 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 31 11:42:35 2013 -0400

    Merge topic 'FindGTK2-gmodule' into next
    
    7ca5958 FindGTK2: Detect gmodule library
    76c72b9 FindGTK2: gthread-2.0 folder does not exist


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ca5958820b7741b251081af66e1cb67af243fd5
commit 7ca5958820b7741b251081af66e1cb67af243fd5
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Jul 31 17:40:07 2013 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Jul 31 17:40:07 2013 +0200

    FindGTK2: Detect gmodule library

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index efb1d9f..f7d3bf8 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -77,6 +77,7 @@
 #     appropriate. A new set of _RELEASE variables was also added.
 #   * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are
 #     marked as advanced by SelectLibraryConfigurations
+#   * Detect gmodule library
 # Version 1.4 (10/4/2012) (CMake 2.8.10)
 #   * 12596: Missing paths for FindGTK2 on NetBSD
 #   * 12049: Fixed detection of GTK include files in the lib folder on
@@ -482,6 +483,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
 
         _GTK2_FIND_LIBRARY    (GTK2_GTHREAD gthread false true)
 
+        _GTK2_FIND_LIBRARY    (GTK2_GMODULE gmodule false true)
+
         _GTK2_FIND_LIBRARY    (GTK2_GIO gio false true)
 
         _GTK2_FIND_INCLUDE_DIR(GTK2_ATK atk/atk.h)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76c72b9f14258933e4cf810da275bd2b931c5ac9
commit 76c72b9f14258933e4cf810da275bd2b931c5ac9
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Jul 31 17:37:46 2013 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Jul 31 17:39:38 2013 +0200

    FindGTK2: gthread-2.0 folder does not exist
    
    Partially revert commit 508e8ca024e47baea342da85c7bbd014c7fd6c30

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 4f522e5..efb1d9f 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -178,7 +178,6 @@ 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

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

Summary of changes:
 Modules/FindGTK2.cmake |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake