[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2532-ge58f711

[Rolf Eike Beer]

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  e58f7118430e0acc2aae640c10207662e9fbdf26 (commit)
       via  55f5ea7b0eae53ba04315397f2874411a94943e5 (commit)
      from  35641d6cec09d7fbc37b07fe3ff43f8740eceb84 (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=e58f7118430e0acc2aae640c10207662e9fbdf26
commit e58f7118430e0acc2aae640c10207662e9fbdf26
Merge: 35641d6 55f5ea7
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Apr 23 16:49:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 23 16:49:53 2014 -0400

    Merge topic 'FindGTK2-X11' into next
    
    55f5ea7b FindGTK2: search for Fontconfig and X11 before using them


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55f5ea7b0eae53ba04315397f2874411a94943e5
commit 55f5ea7b0eae53ba04315397f2874411a94943e5
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Apr 23 22:49:38 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Apr 23 22:49:38 2014 +0200

    FindGTK2: search for Fontconfig and X11 before using them

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 1bdad16..15bcab8 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -643,6 +643,10 @@ endif()
 
 foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
     if(_GTK2_component STREQUAL "gtk")
+        # Left for compatibility with previous versions.
+        _GTK2_FIND_INCLUDE_DIR(FONTCONFIG fontconfig/fontconfig.h)
+        _GTK2_FIND_INCLUDE_DIR(X11 X11/Xlib.h)
+
         _GTK2_FIND_INCLUDE_DIR(GLIB glib.h)
         _GTK2_FIND_INCLUDE_DIR(GLIBCONFIG glibconfig.h)
         _GTK2_FIND_LIBRARY    (GLIB glib false true)
@@ -721,10 +725,6 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
         _GTK2_ADD_TARGET (GTK GTK2_DEPENDS gdk atk pangoft2 pango gdk_pixbuf gthread gobject glib
                               GTK2_OPTIONAL_DEPENDS gio pangocairo cairo)
 
-        # Left for compatibility with previous versions.
-        _GTK2_FIND_INCLUDE_DIR(FONTCONFIG fontconfig/fontconfig.h)
-        _GTK2_FIND_INCLUDE_DIR(X11 X11/Xlib.h)
-
     elseif(_GTK2_component STREQUAL "gtkmm")
 
         _GTK2_FIND_INCLUDE_DIR(SIGC++ sigc++/sigc++.h)

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

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


hooks/post-receive
-- 
CMake