Title: [168702] releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK.cmake
- Revision
- 168702
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:27:22 -0700 (Tue, 13 May 2014)
Log Message
Merge 164559 - [GTK][CMake] Many plugin tests fail when running WebKit1 layout tests
https://bugs.webkit.org/show_bug.cgi?id=129191
Reviewed by Anders Carlsson.
* DumpRenderTree/PlatformGTK.cmake: Properly specify the library build directory
for the GTK+ DumpRenderTree build. We could manually construct this path, but the
name of the directory is "lib" and not "libs". Instead we should use the CMake
variable specifically assigned to this task.
Conflicts:
Tools/ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK.cmake (168701 => 168702)
--- releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK.cmake 2014-05-13 19:27:12 UTC (rev 168701)
+++ releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/PlatformGTK.cmake 2014-05-13 19:27:22 UTC (rev 168702)
@@ -45,7 +45,7 @@
)
add_definitions(
- -DTEST_PLUGIN_DIR="${CMAKE_BINARY_DIR}/libs"
+ -DTEST_PLUGIN_DIR="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
-DTOP_LEVEL_DIR="${CMAKE_SOURCE_DIR}"
)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
