Title: [97992] trunk/Tools
- Revision
- 97992
- Author
- commit-qu...@webkit.org
- Date
- 2011-10-20 10:02:41 -0700 (Thu, 20 Oct 2011)
Log Message
[EFL] Plug ImageDiff/DumpRenderTree on CMake build system
https://bugs.webkit.org/show_bug.cgi?id=70142
Patch by Leandro Pereira <lean...@profusion.mobi> on 2011-10-20
Reviewed by Gustavo Noronha Silva.
* CMakeListsEfl.txt: Include DRT CMakeLists.
* DumpRenderTree/efl/CMakeLists.txt: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/CMakeListsEfl.txt (97991 => 97992)
--- trunk/Tools/CMakeListsEfl.txt 2011-10-20 16:57:16 UTC (rev 97991)
+++ trunk/Tools/CMakeListsEfl.txt 2011-10-20 17:02:41 UTC (rev 97992)
@@ -57,3 +57,5 @@
ADD_EXECUTABLE(Programs/EWebLauncher ${EWebLauncher_SOURCES})
TARGET_LINK_LIBRARIES(Programs/EWebLauncher ${EWebLauncher_LIBRARIES})
ADD_TARGET_PROPERTIES(Programs/EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
+
+INCLUDE(${TOOLS_DIR}/DumpRenderTree/efl/CMakeLists.txt)
Modified: trunk/Tools/ChangeLog (97991 => 97992)
--- trunk/Tools/ChangeLog 2011-10-20 16:57:16 UTC (rev 97991)
+++ trunk/Tools/ChangeLog 2011-10-20 17:02:41 UTC (rev 97992)
@@ -1,3 +1,13 @@
+2011-10-20 Leandro Pereira <lean...@profusion.mobi>
+
+ [EFL] Plug ImageDiff/DumpRenderTree on CMake build system
+ https://bugs.webkit.org/show_bug.cgi?id=70142
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeListsEfl.txt: Include DRT CMakeLists.
+ * DumpRenderTree/efl/CMakeLists.txt: Added.
+
2011-10-20 Philippe Normand <pnorm...@igalia.com>
[style] Allow usage of NULL in gst_*
Added: trunk/Tools/DumpRenderTree/efl/CMakeLists.txt (0 => 97992)
--- trunk/Tools/DumpRenderTree/efl/CMakeLists.txt (rev 0)
+++ trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2011-10-20 17:02:41 UTC (rev 97992)
@@ -0,0 +1,127 @@
+SET(DumpRenderTree_SOURCES
+ ${TOOLS_DIR}/DumpRenderTree/CyclicRedundancyCheck.cpp
+ ${TOOLS_DIR}/DumpRenderTree/GCController.cpp
+ ${TOOLS_DIR}/DumpRenderTree/LayoutTestController.cpp
+ ${TOOLS_DIR}/DumpRenderTree/PixelDumpSupport.cpp
+ ${TOOLS_DIR}/DumpRenderTree/WorkQueue.cpp
+ ${TOOLS_DIR}/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/DumpHistoryItem.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/DumpRenderTree.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/DumpRenderTreeView.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/EventSender.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/FontManagement.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/GCControllerEfl.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/JSStringUtils.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/LayoutTestControllerEfl.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/PixelDumpSupportEfl.cpp
+ ${TOOLS_DIR}/DumpRenderTree/efl/WorkQueueItemEfl.cpp
+)
+
+SET(ImageDiff_SOURCES
+ ${TOOLS_DIR}/DumpRenderTree/efl/ImageDiff.cpp
+)
+
+SET(DumpRenderTree_LIBRARIES
+ ${_javascript_Core_LIBRARY_NAME}
+ ${WebCore_LIBRARY_NAME}
+ ${WebKit_LIBRARY_NAME}
+ ${Cairo_LIBRARIES}
+ ${ECORE_X_LIBRARIES}
+ ${EDJE_LIBRARIES}
+ ${EFLDEPS_LIBRARIES}
+ ${EVAS_LIBRARIES}
+ ${LIBXML2_LIBRARIES}
+ ${LIBXSLT_LIBRARIES}
+ ${SQLITE_LIBRARIES}
+)
+
+SET(DumpRenderTree_LIBRARIES ${DumpRenderTree_LIBRARIES})
+SET(DumpRenderTree_INCLUDE_DIRECTORIES
+ "${WEBKIT_DIR}/efl/ewk"
+ ${Cairo_INCLUDE_DIRS}
+ ${EDJE_INCLUDE_DIRS}
+ ${EFLDEPS_INCLUDE_DIRS}
+ ${EVAS_INCLUDE_DIRS}
+ ${WEBKIT_DIR}/efl
+ ${WEBCORE_DIR}
+ ${WEBCORE_DIR}/bridge
+ ${WEBCORE_DIR}/bridge/jsc
+ ${WEBCORE_DIR}/bindings
+ ${WEBCORE_DIR}/dom
+ ${WEBCORE_DIR}/editing
+ ${WEBCORE_DIR}/css
+ ${WEBCORE_DIR}/html
+ ${WEBCORE_DIR}/page
+ ${WEBCORE_DIR}/page/animation
+ ${WEBCORE_DIR}/platform
+ ${WEBCORE_DIR}/platform/text
+ ${WEBCORE_DIR}/platform/graphics
+ ${WEBCORE_DIR}/platform/graphics/cairo
+ ${WEBCORE_DIR}/platform/network
+ ${WEBCORE_DIR}/rendering
+ ${WEBCORE_DIR}/rendering/style
+ ${WEBCORE_DIR}/history
+ ${WEBCORE_DIR}/loader
+ ${WEBCORE_DIR}/loader/cache
+ ${WEBCORE_DIR}/loader/icon
+ ${_javascript_CORE_DIR}
+ ${_javascript_CORE_DIR}/API
+ ${_javascript_CORE_DIR}/assembler
+ ${_javascript_CORE_DIR}/dfg
+ ${_javascript_CORE_DIR}/heap
+ ${_javascript_CORE_DIR}/interpreter
+ ${_javascript_CORE_DIR}/jit
+ ${_javascript_CORE_DIR}/runtime
+ ${_javascript_CORE_DIR}/ForwardingHeaders
+ ${_javascript_CORE_DIR}/wtf
+ ${_javascript_CORE_DIR}/wtf/efl
+ ${TOOLS_DIR}/DumpRenderTree
+ ${TOOLS_DIR}/DumpRenderTree/cairo
+ ${TOOLS_DIR}/DumpRenderTree/efl
+ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${DERIVED_SOURCES_WEBCORE_DIR}
+ ${WEBCORE_DIR}/bindings/js
+)
+
+SET(DumpRenderTree_LINK_FLAGS
+ ${ECORE_X_LDFLAGS}
+ ${EDJE_LDFLAGS}
+ ${EFLDEPS_LDFLAGS}
+ ${EVAS_LDFLAGS}
+)
+
+IF (ENABLE_GLIB_SUPPORT)
+ LIST(APPEND DumpRenderTree_INCLUDE_DIRECTORIES "${_javascript_CORE_DIR}/wtf/gobject")
+
+ LIST(APPEND DumpRenderTree_LIBRARIES
+ ${Gdk_LIBRARIES}
+ ${Glib_LIBRARIES}
+ ${Gthread_LIBRARIES}
+ )
+ENDIF ()
+
+IF (WTF_USE_SOUP)
+ LIST(APPEND DumpRenderTree_LIBRARIES ${LIBSOUP24_LIBRARIES})
+ LIST(APPEND DumpRenderTree_LINK_FLAGS ${LIBSOUP24_LDFLAGS})
+ LIST(APPEND DumpRenderTree_INCLUDE_DIRECTORIES ${LIBSOUP24_INCLUDE_DIRS} ${WEBCORE_DIR}/platform/network/soup)
+ENDIF ()
+
+IF (WTF_USE_CURL)
+ LIST(APPEND DumpRenderTree_LIBRARIES ${CURL_LIBRARIES})
+ LIST(APPEND DumpRenderTree_LINK_FLAGS ${CURL_LDFLAGS})
+ LIST(APPEND DumpRenderTree_INCLUDE_DIRECTORIES ${WEBCORE_DIR}/platform/network/curl)
+ENDIF ()
+
+ADD_DEFINITIONS(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts")
+
+INCLUDE_DIRECTORIES(${DumpRenderTree_INCLUDE_DIRECTORIES})
+
+ADD_EXECUTABLE(Programs/DumpRenderTree ${DumpRenderTree_SOURCES})
+TARGET_LINK_LIBRARIES(Programs/DumpRenderTree ${DumpRenderTree_LIBRARIES})
+ADD_TARGET_PROPERTIES(Programs/DumpRenderTree LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
+
+ADD_EXECUTABLE(Programs/ImageDiff ${ImageDiff_SOURCES})
+TARGET_LINK_LIBRARIES(Programs/ImageDiff ${DumpRenderTree_LIBRARIES})
+ADD_TARGET_PROPERTIES(Programs/ImageDiff LINK_FLAGS "${DumpRenderTree_LINK_FLAGS}")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
