Title: [160937] trunk/Tools
- Revision
- 160937
- Author
- [email protected]
- Date
- 2013-12-20 15:44:11 -0800 (Fri, 20 Dec 2013)
Log Message
[GTK] [CMake] Add support for building DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=125767
Reviewed by Gustavo Noronha Silva.
* CMakeLists.txt: Load the DumpRenderTree cmake file for GTK+ when WebKit1 is enabled.
* DumpRenderTree/PlatformGTK.cmake: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/CMakeLists.txt (160936 => 160937)
--- trunk/Tools/CMakeLists.txt 2013-12-20 23:38:06 UTC (rev 160936)
+++ trunk/Tools/CMakeLists.txt 2013-12-20 23:44:11 UTC (rev 160937)
@@ -21,6 +21,7 @@
endif ()
if (ENABLE_WEBKIT)
add_subdirectory(GtkLauncher)
+ add_subdirectory(DumpRenderTree)
endif ()
add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
elseif ("${PORT}" STREQUAL "WinCE")
Modified: trunk/Tools/ChangeLog (160936 => 160937)
--- trunk/Tools/ChangeLog 2013-12-20 23:38:06 UTC (rev 160936)
+++ trunk/Tools/ChangeLog 2013-12-20 23:44:11 UTC (rev 160937)
@@ -1,5 +1,15 @@
2013-12-20 Martin Robinson <[email protected]>
+ [GTK] [CMake] Add support for building DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=125767
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Load the DumpRenderTree cmake file for GTK+ when WebKit1 is enabled.
+ * DumpRenderTree/PlatformGTK.cmake: Added.
+
+2013-12-20 Martin Robinson <[email protected]>
+
[GTK] [CMake] Add support for building WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=125768
Added: trunk/Tools/DumpRenderTree/PlatformGTK.cmake (0 => 160937)
--- trunk/Tools/DumpRenderTree/PlatformGTK.cmake (rev 0)
+++ trunk/Tools/DumpRenderTree/PlatformGTK.cmake 2013-12-20 23:44:11 UTC (rev 160937)
@@ -0,0 +1,50 @@
+list(APPEND DumpRenderTree_SOURCES
+ atk/AccessibilityCallbacksAtk.cpp
+ atk/AccessibilityControllerAtk.cpp
+ atk/AccessibilityNotificationHandlerAtk.cpp
+ atk/AccessibilityUIElementAtk.cpp
+
+ cairo/PixelDumpSupportCairo.cpp
+
+ gtk/AccessibilityControllerGtk.cpp
+ gtk/DumpRenderTree.cpp
+ gtk/EditingCallbacks.cpp
+ gtk/EventSender.cpp
+ gtk/GCControllerGtk.cpp
+ gtk/PixelDumpSupportGtk.cpp
+ gtk/SelfScrollingWebKitWebView.cpp
+ gtk/TestRunnerGtk.cpp
+ gtk/TextInputController.cpp
+ gtk/WorkQueueItemGtk.cpp
+)
+
+list(APPEND DumpRenderTree_LIBRARIES
+ WebCorePlatformGTK
+ ${ATK_LIBRARIES}
+ ${CAIRO_LIBRARIES}
+ ${FONTCONFIG_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GTK3_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
+)
+
+list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
+ ${DERIVED_SOURCES_DIR}
+ ${WEBKIT_DIR}/gtk
+ ${WEBCORE_DIR}/platform/gtk
+ ${TOOLS_DIR}/DumpRenderTree/atk
+ ${TOOLS_DIR}/DumpRenderTree/cairo
+ ${TOOLS_DIR}/DumpRenderTree/gtk
+ ${ATK_INCLUDE_DIRS}
+ ${CAIRO_INCLUDE_DIRS}
+ ${FONTCONFIG_INCLUDE_DIR}
+ ${GLIB_INCLUDE_DIRS}
+ ${GTK3_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
+)
+
+add_definitions(
+ -DTEST_PLUGIN_DIR="${CMAKE_BINARY_DIR}/libs"
+ -DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
+ -DTOP_LEVEL_DIR="${CMAKE_SOURCE_DIR}"
+)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
