[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cmake
Subject:    [CMake] [PATCH] FindGTK2: Move check for pangocairo in gtk module
From:       "Daniele E. Domenichelli" <daniele.domenichelli () gmail ! com>
Date:       2013-06-14 23:02:38
Message-ID: 51BBA10E.7090105 () gmail ! com
[Download RAW message or body]

Dear CMake developers,

FindGTK2 searches for pangocairo only when looking for the gtkmm module,
but afaik it is possible to use the pangocairo library without gtkmm.
Therefore I believe that it should search the library in the gtk module.

Attached is a patch that fixes this issue.


Regards,
 Daniele

["0001-FindGTK2-Move-check-for-pangocairo-in-gtk-module.patch" (text/x-patch)]

From 5e93a9fc0671e62cf95e8a28c61e4b6ec8eca129 Mon Sep 17 00:00:00 2001
From: "Daniele E. Domenichelli" <ddomenichelli@kde.org>
Date: Sat, 15 Jun 2013 00:53:56 +0200
Subject: [PATCH] FindGTK2: Move check for pangocairo in gtk module

---
 Modules/FindGTK2.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 06cf962..7d5a5c4 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 true 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)
-- 
1.7.10.4



--

Powered by www.kitware.com

Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake

[prev in list] [next in list] [prev in thread] [next in thread]