Merge r181793 - [GTK] Search for the Wayland dependency when enabling…

… Wayland target

https://bugs.webkit.org/show_bug.cgi?id=142876

Reviewed by Carlos Garcia Campos.

* Source/cmake/OptionsGTK.cmake: The Wayland dependency isn't a public
requirement of either the GTK+ or GDK pkg-config files, so we have to
search for it ourselves when WebKitGTK+ has been configured to support
the Wayland windowing target.

ChangeLog

@@ -1,3 +1,15 @@
+2015-03-20  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Search for the Wayland dependency when enabling Wayland target
+        https://bugs.webkit.org/show_bug.cgi?id=142876
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/OptionsGTK.cmake: The Wayland dependency isn't a public
+        requirement of either the GTK+ or GDK pkg-config files, so we have to
+        search for it ourselves when WebKitGTK+ has been configured to support
+        the Wayland windowing target.
+
 2015-03-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.7.92 release.

Source/cmake/OptionsGTK.cmake

@@ -76,6 +76,10 @@ if (ENABLE_X11_TARGET)
     endif ()
 endif ()
 
+if (ENABLE_WAYLAND_TARGET)
+    find_package(Wayland REQUIRED)
+endif ()
+
 WEBKIT_OPTION_BEGIN()
 WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." ON)
 WEBKIT_OPTION_DEFINE(ENABLE_MINIBROWSER "Whether to enable MiniBrowser compilation." OFF)