Title: [186768] trunk/Source/WebCore
- Revision
- 186768
- Author
- [email protected]
- Date
- 2015-07-13 12:11:42 -0700 (Mon, 13 Jul 2015)
Log Message
GTK] Build race with -DENABLE_WAYLAND_TARGET=ON
https://bugs.webkit.org/show_bug.cgi?id=146740
Reviewed by Martin Robinson.
No new tests, no behavior changes.
* PlatformGTK.cmake: platform/graphics/wayland sources should be
included into WebCore source list instead of WebCorePlatformGTK.
Also move the add_custom_command() block into if(ENABLE_WAYLAND_TARGET),
this is not strictly needed to fix this bug, but it seems cleaner.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (186767 => 186768)
--- trunk/Source/WebCore/ChangeLog 2015-07-13 19:03:33 UTC (rev 186767)
+++ trunk/Source/WebCore/ChangeLog 2015-07-13 19:11:42 UTC (rev 186768)
@@ -1,3 +1,17 @@
+2015-07-13 Carlos Alberto Lopez Perez <[email protected]>
+
+ GTK] Build race with -DENABLE_WAYLAND_TARGET=ON
+ https://bugs.webkit.org/show_bug.cgi?id=146740
+
+ Reviewed by Martin Robinson.
+
+ No new tests, no behavior changes.
+
+ * PlatformGTK.cmake: platform/graphics/wayland sources should be
+ included into WebCore source list instead of WebCorePlatformGTK.
+ Also move the add_custom_command() block into if(ENABLE_WAYLAND_TARGET),
+ this is not strictly needed to fix this bug, but it seems cleaner.
+
2015-07-13 Matthew Daiter <[email protected]>
Adding MediaStream Engine building blocks to the code repo
Modified: trunk/Source/WebCore/PlatformGTK.cmake (186767 => 186768)
--- trunk/Source/WebCore/PlatformGTK.cmake 2015-07-13 19:03:33 UTC (rev 186767)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-07-13 19:11:42 UTC (rev 186768)
@@ -467,17 +467,17 @@
)
endif ()
-# Wayland protocol extension.
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandClientProtocol.c
- DEPENDS ${WEBCORE_DIR}/platform/graphics/wayland/WebKitGtkWaylandClientProtocol.xml
- COMMAND wayland-scanner server-header < ${WEBCORE_DIR}/platform/graphics/wayland/WebKitGtkWaylandClientProtocol.xml > ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandServerProtocol.h
- COMMAND wayland-scanner client-header < ${WEBCORE_DIR}/platform/graphics/wayland/WebKitGtkWaylandClientProtocol.xml > ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandClientProtocol.h
- COMMAND wayland-scanner code < ${WEBCORE_DIR}/platform/graphics/wayland/WebKitGtkWaylandClientProtocol.xml > ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandClientProtocol.c
-)
+if (ENABLE_WAYLAND_TARGET)
+ # Wayland protocol extension.
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandClientProtocol.c
+ DEPENDS ${WEBCORE_DIR}/platform/graphics/wayland/WebKitGtkWaylandClientProtocol.xml
+ COMMAND wayland-scanner server-header < ${WEBCORE_DIR}/platform/graphics/wayland/WebKitGtkWaylandClientProtocol.xml > ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandServerProtocol.h
+ COMMAND wayland-scanner client-header < ${WEBCORE_DIR}/platform/graphics/wayland/WebKitGtkWaylandClientProtocol.xml > ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandClientProtocol.h
+ COMMAND wayland-scanner code < ${WEBCORE_DIR}/platform/graphics/wayland/WebKitGtkWaylandClientProtocol.xml > ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandClientProtocol.c
+ )
-if (ENABLE_WAYLAND_TARGET)
- list(APPEND WebCorePlatformGTK_SOURCES
+ list(APPEND WebCore_SOURCES
platform/graphics/wayland/PlatformDisplayWayland.cpp
platform/graphics/wayland/WaylandEventSource.cpp
platform/graphics/wayland/WaylandSurface.cpp
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
