summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2014-04-23 20:49:38 (GMT)
committerRolf Eike Beer <eike@sf-mail.de>2014-04-23 20:49:38 (GMT)
commit55f5ea7b0eae53ba04315397f2874411a94943e5 (patch)
treee1d426cf6c97b510b16180fea9df7cab5ada466d /Modules
parent608532fa2b0b9ac289eeb2052e0a9dfebba4d90f (diff)
downloadCMake-55f5ea7b0eae53ba04315397f2874411a94943e5.zip
CMake-55f5ea7b0eae53ba04315397f2874411a94943e5.tar.gz
CMake-55f5ea7b0eae53ba04315397f2874411a94943e5.tar.bz2
FindGTK2: search for Fontconfig and X11 before using them
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindGTK2.cmake8
1 files changed, 4 insertions, 4 deletions
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)