Title: [168722] releases/WebKitGTK/webkit-2.4/Source
- Revision
- 168722
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:32:04 -0700 (Tue, 13 May 2014)
Log Message
Merge 165437 - [GTK][CMake] Add HARFBUZZ_INCLUDE_DIRS to WebKit and WebKit2
https://bugs.webkit.org/show_bug.cgi?id=130070
Reviewed by Martin Robinson.
Source/WebKit:
* PlatformGTK.cmake:
Source/WebKit2:
* PlatformGTK.cmake:
Conflicts:
Source/WebKit/ChangeLog
Source/WebKit2/ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake (168721 => 168722)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake 2014-05-13 19:31:52 UTC (rev 168721)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake 2014-05-13 19:32:04 UTC (rev 168722)
@@ -32,6 +32,7 @@
${ENCHANT_INCLUDE_DIRS}
${GEOCLUE_INCLUDE_DIRS}
${GTK_INCLUDE_DIRS}
+ ${HARFBUZZ_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
)
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake (168721 => 168722)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake 2014-05-13 19:31:52 UTC (rev 168721)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake 2014-05-13 19:32:04 UTC (rev 168722)
@@ -422,6 +422,7 @@
${CAIRO_INCLUDE_DIRS}
${ENCHANT_INCLUDE_DIRS}
${GEOCLUE_INCLUDE_DIRS}
+ ${HARFBUZZ_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
