Title: [173619] trunk/Source/WebCore
- Revision
- 173619
- Author
- [email protected]
- Date
- 2014-09-15 04:35:08 -0700 (Mon, 15 Sep 2014)
Log Message
[GTK][CMake] Build WebCore with Wayland-specific include directories, libraries
https://bugs.webkit.org/show_bug.cgi?id=136815
Reviewed by Philippe Normand.
* PlatformGTK.cmake: Add the platform/graphics/wayland/ directory to the list of
WebCore's include directories. Add include directories of the Wayland dependency
to the list of WebCore's include directories. Same for the Wayland libraries.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (173618 => 173619)
--- trunk/Source/WebCore/ChangeLog 2014-09-15 11:32:34 UTC (rev 173618)
+++ trunk/Source/WebCore/ChangeLog 2014-09-15 11:35:08 UTC (rev 173619)
@@ -1,3 +1,14 @@
+2014-09-15 Zan Dobersek <[email protected]>
+
+ [GTK][CMake] Build WebCore with Wayland-specific include directories, libraries
+ https://bugs.webkit.org/show_bug.cgi?id=136815
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake: Add the platform/graphics/wayland/ directory to the list of
+ WebCore's include directories. Add include directories of the Wayland dependency
+ to the list of WebCore's include directories. Same for the Wayland libraries.
+
2014-09-15 [email protected] <[email protected]>
[WinCairo] Make it easier to enable/disable GStreamer.
Modified: trunk/Source/WebCore/PlatformGTK.cmake (173618 => 173619)
--- trunk/Source/WebCore/PlatformGTK.cmake 2014-09-15 11:32:34 UTC (rev 173618)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-09-15 11:35:08 UTC (rev 173619)
@@ -14,6 +14,7 @@
"${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
"${WEBCORE_DIR}/platform/graphics/opengl"
"${WEBCORE_DIR}/platform/graphics/opentype"
+ "${WEBCORE_DIR}/platform/graphics/wayland"
"${WEBCORE_DIR}/platform/linux"
"${WEBCORE_DIR}/platform/mediastream/gstreamer"
"${WEBCORE_DIR}/platform/mock/mediasource"
@@ -434,6 +435,13 @@
${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandClientProtocol.c
)
+
+ list(APPEND WebCore_INCLUDE_DIRECTORIES
+ ${WAYLAND_INCLUDE_DIRECTORIES}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${WAYLAND_LIBRARIES}
+ )
endif ()
add_library(WebCorePlatformGTK ${WebCore_LIBRARY_TYPE} ${WebCorePlatformGTK_SOURCES})
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
