Title: [205294] trunk/Source/WebKit2
- Revision
- 205294
- Author
- commit-qu...@webkit.org
- Date
- 2016-09-01 10:31:59 -0700 (Thu, 01 Sep 2016)
Log Message
[GTK] Fix configuration without wayland support
https://bugs.webkit.org/show_bug.cgi?id=161475
WebKit2WaylandClientProtocol.c is a derived source that is created
conditionally on ENABLE_WAYLAND_TARGET. It was being included
in the sources list unconditionally, so configure failed whenever
wayland support was unavailable.
Patch by Jeremy Huddleston Sequoia <jerem...@apple.com> on 2016-09-01
Reviewed by Žan Doberšek.
* PlatformGTK.cmake: Include WebKit2WaylandClientProtocol.c in source list conditional on ENABLE_WAYLAND_TARGET
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (205293 => 205294)
--- trunk/Source/WebKit2/ChangeLog 2016-09-01 17:10:45 UTC (rev 205293)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-01 17:31:59 UTC (rev 205294)
@@ -1,3 +1,17 @@
+2016-09-01 Jeremy Huddleston Sequoia <jerem...@apple.com>
+
+ [GTK] Fix configuration without wayland support
+ https://bugs.webkit.org/show_bug.cgi?id=161475
+
+ WebKit2WaylandClientProtocol.c is a derived source that is created
+ conditionally on ENABLE_WAYLAND_TARGET. It was being included
+ in the sources list unconditionally, so configure failed whenever
+ wayland support was unavailable.
+
+ Reviewed by Žan Doberšek.
+
+ * PlatformGTK.cmake: Include WebKit2WaylandClientProtocol.c in source list conditional on ENABLE_WAYLAND_TARGET
+
2016-08-31 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Move GObject DOM bindings to WebKit2 layer and stop auto generating them
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (205293 => 205294)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-09-01 17:10:45 UTC (rev 205293)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-09-01 17:31:59 UTC (rev 205294)
@@ -555,12 +555,17 @@
${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.c
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
)
+if (ENABLE_WAYLAND_TARGET)
+ list(APPEND WebKit2_DERIVED_SOURCES
+ ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.c
+ )
+endif ()
+
set(WebKit2GTK_INSTALLED_HEADERS
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
