diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-24 13:24:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-04-24 13:24:57 (GMT) |
| commit | 9264983b82cf8fa28e7fe8858868261434d74954 (patch) | |
| tree | 6f9ceef7624ca259d460a65d367fdef4d3aec039 | |
| parent | 9b8685f7d05871421de576cd61b1bbdf7faaa92d (diff) | |
| parent | 55f5ea7b0eae53ba04315397f2874411a94943e5 (diff) | |
| download | CMake-9264983b82cf8fa28e7fe8858868261434d74954.zip CMake-9264983b82cf8fa28e7fe8858868261434d74954.tar.gz CMake-9264983b82cf8fa28e7fe8858868261434d74954.tar.bz2 | |
Merge topic 'FindGTK2-X11'
55f5ea7b FindGTK2: search for Fontconfig and X11 before using them
| -rw-r--r-- | Modules/FindGTK2.cmake | 8 |
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) |