Title: [181794] releases/WebKitGTK/webkit-2.8
- Revision
- 181794
- Author
- [email protected]
- Date
- 2015-03-20 02:26:50 -0700 (Fri, 20 Mar 2015)
Log Message
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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/ChangeLog (181793 => 181794)
--- releases/WebKitGTK/webkit-2.8/ChangeLog 2015-03-20 09:23:40 UTC (rev 181793)
+++ releases/WebKitGTK/webkit-2.8/ChangeLog 2015-03-20 09:26:50 UTC (rev 181794)
@@ -1,3 +1,15 @@
+2015-03-20 Zan Dobersek <[email protected]>
+
+ [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 <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.7.92 release.
Modified: releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake (181793 => 181794)
--- releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-03-20 09:23:40 UTC (rev 181793)
+++ releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-03-20 09:26:50 UTC (rev 181794)
@@ -76,6 +76,10 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
