Add general CMakeLists.txt for DRT
authorparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Sep 2013 13:01:32 +0000 (13:01 +0000)
committerparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Sep 2013 13:01:32 +0000 (13:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=119268

Reviewed by Gyuyoung Kim.

The new file allows better sharing between ports.

* CMakeLists.txt:
* DumpRenderTree/CMakeLists.txt: Added.
* DumpRenderTree/PlatformEfl.cmake: Added.
* DumpRenderTree/efl/CMakeLists.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156538 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/CMakeLists.txt
Tools/ChangeLog
Tools/DumpRenderTree/CMakeLists.txt [new file with mode: 0644]
Tools/DumpRenderTree/PlatformEfl.cmake [new file with mode: 0644]
Tools/DumpRenderTree/efl/CMakeLists.txt [deleted file]

index 5ce79a9..9776f96 100644 (file)
@@ -7,7 +7,7 @@ if ("${PORT}" STREQUAL "Efl")
     add_subdirectory(EWebLauncher/ControlTheme)
 
     if (ENABLE_WEBKIT)
-        add_subdirectory(DumpRenderTree/efl)
+        add_subdirectory(DumpRenderTree)
         add_subdirectory(EWebLauncher)
     endif ()
 
index d740b71..ff16ca7 100644 (file)
@@ -1,3 +1,17 @@
+2013-09-27  Patrick Gansterer  <paroga@webkit.org>
+
+        Add general CMakeLists.txt for DRT
+        https://bugs.webkit.org/show_bug.cgi?id=119268
+
+        Reviewed by Gyuyoung Kim.
+
+        The new file allows better sharing between ports.
+
+        * CMakeLists.txt:
+        * DumpRenderTree/CMakeLists.txt: Added.
+        * DumpRenderTree/PlatformEfl.cmake: Added.
+        * DumpRenderTree/efl/CMakeLists.txt: Removed.
+
 2013-09-27  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         [Qt] Fix force_static_libs_as_shared in WebKit2
diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6ceaa4f
--- /dev/null
@@ -0,0 +1,75 @@
+set(DumpRenderTree_SOURCES
+    AccessibilityController.cpp
+    AccessibilityTextMarker.cpp
+    AccessibilityUIElement.cpp
+    CyclicRedundancyCheck.cpp
+    DumpRenderTreeCommon.cpp
+    GCController.cpp
+    PixelDumpSupport.cpp
+    TestRunner.cpp
+    WorkQueue.cpp
+)
+
+set(DumpRenderTree_LIBRARIES
+    JavaScriptCore
+    WTF
+    WebCore
+    WebCoreTestSupport
+    WebKit
+)
+
+set(DumpRenderTree_INCLUDE_DIRECTORIES
+    ${WEBCORE_DIR}
+    ${WEBCORE_DIR}/bindings
+    ${WEBCORE_DIR}/bridge
+    ${WEBCORE_DIR}/bridge/jsc
+    ${WEBCORE_DIR}/css
+    ${WEBCORE_DIR}/dom
+    ${WEBCORE_DIR}/editing
+    ${WEBCORE_DIR}/history
+    ${WEBCORE_DIR}/html
+    ${WEBCORE_DIR}/inspector
+    ${WEBCORE_DIR}/loader
+    ${WEBCORE_DIR}/loader/cache
+    ${WEBCORE_DIR}/loader/icon
+    ${WEBCORE_DIR}/page
+    ${WEBCORE_DIR}/page/animation
+    ${WEBCORE_DIR}/platform
+    ${WEBCORE_DIR}/platform/animation
+    ${WEBCORE_DIR}/platform/graphics
+    ${WEBCORE_DIR}/platform/graphics/transforms
+    ${WEBCORE_DIR}/platform/network
+    ${WEBCORE_DIR}/platform/text
+    ${WEBCORE_DIR}/plugins
+    ${WEBCORE_DIR}/rendering
+    ${WEBCORE_DIR}/rendering/shapes
+    ${WEBCORE_DIR}/rendering/style
+    ${JAVASCRIPTCORE_DIR}
+    ${JAVASCRIPTCORE_DIR}/API
+    ${JAVASCRIPTCORE_DIR}/assembler
+    ${JAVASCRIPTCORE_DIR}/bytecode
+    ${JAVASCRIPTCORE_DIR}/dfg
+    ${JAVASCRIPTCORE_DIR}/disassembler
+    ${JAVASCRIPTCORE_DIR}/heap
+    ${JAVASCRIPTCORE_DIR}/interpreter
+    ${JAVASCRIPTCORE_DIR}/jit
+    ${JAVASCRIPTCORE_DIR}/llint
+    ${JAVASCRIPTCORE_DIR}/profiler
+    ${JAVASCRIPTCORE_DIR}/runtime
+    ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
+    ${TOOLS_DIR}/DumpRenderTree
+    ${WTF_DIR}
+    ${CMAKE_SOURCE_DIR}/Source
+    ${CMAKE_BINARY_DIR}
+    ${DERIVED_SOURCES_WEBCORE_DIR}
+    ${WEBCORE_DIR}/bindings/js
+    ${WEBCORE_DIR}/testing/js
+)
+
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
+include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})
+
+add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
+target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
+set_target_properties(DumpRenderTree PROPERTIES FOLDER "Tools")
diff --git a/Tools/DumpRenderTree/PlatformEfl.cmake b/Tools/DumpRenderTree/PlatformEfl.cmake
new file mode 100644 (file)
index 0000000..d751bc8
--- /dev/null
@@ -0,0 +1,80 @@
+list(APPEND DumpRenderTree_SOURCES
+    atk/AccessibilityCallbacksAtk.cpp
+    atk/AccessibilityControllerAtk.cpp
+    atk/AccessibilityNotificationHandlerAtk.cpp
+    atk/AccessibilityUIElementAtk.cpp
+
+    cairo/PixelDumpSupportCairo.cpp
+
+    efl/AccessibilityControllerEfl.cpp
+    efl/DumpHistoryItem.cpp
+    efl/DumpRenderTree.cpp
+    efl/DumpRenderTreeChrome.cpp
+    efl/DumpRenderTreeView.cpp
+    efl/EditingCallbacks.cpp
+    efl/EventSender.cpp
+    efl/FontManagement.cpp
+    efl/GCControllerEfl.cpp
+    efl/JSStringUtils.cpp
+    efl/PixelDumpSupportEfl.cpp
+    efl/TestRunnerEfl.cpp
+    efl/TextInputController.cpp
+    efl/WorkQueueItemEfl.cpp
+)
+
+list(APPEND DumpRenderTree_LIBRARIES
+    ${CAIRO_LIBRARIES}
+    ${ECORE_EVAS_LIBRARIES}
+    ${ECORE_FILE_LIBRARIES}
+    ${ECORE_INPUT_LIBRARIES}
+    ${ECORE_LIBRARIES}
+    ${EDJE_LIBRARIES}
+    ${EINA_LIBRARIES}
+    ${EO_LIBRARIES}
+    ${EVAS_LIBRARIES}
+    ${FONTCONFIG_LIBRARIES}
+    ${GLIB_LIBRARIES}
+    ${LIBSOUP_LIBRARIES}
+    ${LIBXML2_LIBRARIES}
+    ${LIBXSLT_LIBRARIES} -lm
+    ${SQLITE_LIBRARIES}
+)
+
+list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
+    "${WEBKIT_DIR}/efl/ewk"
+    ${WEBKIT_DIR}/efl
+    ${WEBKIT_DIR}/efl/WebCoreSupport
+    ${WEBCORE_DIR}/platform/graphics/cairo
+    ${WEBCORE_DIR}/platform/network/soup
+    ${TOOLS_DIR}/DumpRenderTree/atk
+    ${TOOLS_DIR}/DumpRenderTree/cairo
+    ${TOOLS_DIR}/DumpRenderTree/efl
+    ${CAIRO_INCLUDE_DIRS}
+    ${ECORE_INCLUDE_DIRS}
+    ${ECORE_INCLUDE_DIRS}
+    ${ECORE_EVAS_INCLUDE_DIRS}
+    ${ECORE_FILE_INCLUDE_DIRS}
+    ${ECORE_INPUT_INCLUDE_DIRS}
+    ${EDJE_INCLUDE_DIRS}
+    ${EINA_INCLUDE_DIRS}
+    ${EO_INCLUDE_DIRS}
+    ${EVAS_INCLUDE_DIRS}
+    ${FONTCONFIG_INCLUDE_DIR}
+    ${GLIB_INCLUDE_DIRS}
+    ${LIBSOUP_INCLUDE_DIRS}
+)
+
+if (ENABLE_ACCESSIBILITY)
+    list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
+        ${TOOLS_DIR}/DumpRenderTree/atk
+        ${ATK_INCLUDE_DIRS}
+    )
+    list(APPEND DumpRenderTree_LIBRARIES
+        ${ATK_LIBRARIES}
+    )
+endif ()
+
+# FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory
+# structure. See <https://bugs.webkit.org/show_bug.cgi?id=81475>.
+add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
+                -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3")
diff --git a/Tools/DumpRenderTree/efl/CMakeLists.txt b/Tools/DumpRenderTree/efl/CMakeLists.txt
deleted file mode 100644 (file)
index c46aeea..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-set(DumpRenderTree_SOURCES
-    ${TOOLS_DIR}/DumpRenderTree/AccessibilityController.cpp
-    ${TOOLS_DIR}/DumpRenderTree/AccessibilityTextMarker.cpp
-    ${TOOLS_DIR}/DumpRenderTree/AccessibilityUIElement.cpp
-    ${TOOLS_DIR}/DumpRenderTree/DumpRenderTreeCommon.cpp
-    ${TOOLS_DIR}/DumpRenderTree/CyclicRedundancyCheck.cpp
-    ${TOOLS_DIR}/DumpRenderTree/GCController.cpp
-    ${TOOLS_DIR}/DumpRenderTree/TestRunner.cpp
-    ${TOOLS_DIR}/DumpRenderTree/PixelDumpSupport.cpp
-    ${TOOLS_DIR}/DumpRenderTree/WorkQueue.cpp
-    ${TOOLS_DIR}/DumpRenderTree/atk/AccessibilityCallbacksAtk.cpp
-    ${TOOLS_DIR}/DumpRenderTree/atk/AccessibilityControllerAtk.cpp
-    ${TOOLS_DIR}/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp
-    ${TOOLS_DIR}/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp
-    ${TOOLS_DIR}/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp
-    ${TOOLS_DIR}/DumpRenderTree/efl/AccessibilityControllerEfl.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/EditingCallbacks.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/TestRunnerEfl.cpp
-    ${TOOLS_DIR}/DumpRenderTree/efl/PixelDumpSupportEfl.cpp
-    ${TOOLS_DIR}/DumpRenderTree/efl/TextInputController.cpp
-    ${TOOLS_DIR}/DumpRenderTree/efl/WorkQueueItemEfl.cpp
-)
-
-set(DumpRenderTree_LIBRARIES
-    JavaScriptCore
-    WebCoreTestSupport
-    WebCore
-    WebKit
-    WTF
-    ${CAIRO_LIBRARIES}
-    ${ECORE_LIBRARIES}
-    ${ECORE_EVAS_LIBRARIES}
-    ${ECORE_FILE_LIBRARIES}
-    ${ECORE_INPUT_LIBRARIES}
-    ${EDJE_LIBRARIES}
-    ${EINA_LIBRARIES}
-    ${EO_LIBRARIES}
-    ${EVAS_LIBRARIES}
-    ${FONTCONFIG_LIBRARIES}
-    ${LIBXML2_LIBRARIES}
-    ${LIBXSLT_LIBRARIES} -lm
-    ${SQLITE_LIBRARIES}
-    ${GLIB_LIBRARIES}
-    ${LIBSOUP_LIBRARIES}
-)
-
-set(DumpRenderTree_INCLUDE_DIRECTORIES
-    "${WEBKIT_DIR}/efl/ewk"
-    ${WEBKIT_DIR}/efl
-    ${WEBKIT_DIR}/efl/WebCoreSupport
-    ${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}/inspector
-    ${WEBCORE_DIR}/page
-    ${WEBCORE_DIR}/page/animation
-    ${WEBCORE_DIR}/platform
-    ${WEBCORE_DIR}/platform/animation
-    ${WEBCORE_DIR}/platform/text
-    ${WEBCORE_DIR}/platform/graphics
-    ${WEBCORE_DIR}/platform/graphics/cairo
-    ${WEBCORE_DIR}/platform/graphics/transforms
-    ${WEBCORE_DIR}/platform/network
-    ${WEBCORE_DIR}/platform/network/soup
-    ${WEBCORE_DIR}/plugins
-    ${WEBCORE_DIR}/rendering
-    ${WEBCORE_DIR}/rendering/shapes
-    ${WEBCORE_DIR}/rendering/style
-    ${WEBCORE_DIR}/history
-    ${WEBCORE_DIR}/loader
-    ${WEBCORE_DIR}/loader/cache
-    ${WEBCORE_DIR}/loader/icon
-    ${JAVASCRIPTCORE_DIR}
-    ${JAVASCRIPTCORE_DIR}/API
-    ${JAVASCRIPTCORE_DIR}/assembler
-    ${JAVASCRIPTCORE_DIR}/bytecode
-    ${JAVASCRIPTCORE_DIR}/dfg
-    ${JAVASCRIPTCORE_DIR}/disassembler
-    ${JAVASCRIPTCORE_DIR}/heap
-    ${JAVASCRIPTCORE_DIR}/interpreter
-    ${JAVASCRIPTCORE_DIR}/jit
-    ${JAVASCRIPTCORE_DIR}/llint
-    ${JAVASCRIPTCORE_DIR}/profiler
-    ${JAVASCRIPTCORE_DIR}/runtime
-    ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
-    ${TOOLS_DIR}/DumpRenderTree
-    ${TOOLS_DIR}/DumpRenderTree/atk
-    ${TOOLS_DIR}/DumpRenderTree/cairo
-    ${TOOLS_DIR}/DumpRenderTree/efl
-    ${WTF_DIR}
-    ${CMAKE_SOURCE_DIR}/Source
-    ${CMAKE_BINARY_DIR}
-    ${DERIVED_SOURCES_WEBCORE_DIR}
-    ${WEBCORE_DIR}/bindings/js
-    ${WEBCORE_DIR}/testing/js
-    ${CAIRO_INCLUDE_DIRS}
-    ${ECORE_INCLUDE_DIRS}
-    ${ECORE_INCLUDE_DIRS}
-    ${ECORE_EVAS_INCLUDE_DIRS}
-    ${ECORE_FILE_INCLUDE_DIRS}
-    ${ECORE_INPUT_INCLUDE_DIRS}
-    ${EDJE_INCLUDE_DIRS}
-    ${EINA_INCLUDE_DIRS}
-    ${EO_INCLUDE_DIRS}
-    ${EVAS_INCLUDE_DIRS}
-    ${FONTCONFIG_INCLUDE_DIR}
-    ${GLIB_INCLUDE_DIRS}
-    ${LIBSOUP_INCLUDE_DIRS}
-)
-
-if (ENABLE_ACCESSIBILITY)
-    list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
-        ${TOOLS_DIR}/DumpRenderTree/atk
-        ${ATK_INCLUDE_DIRS}
-    )
-    list(APPEND DumpRenderTree_LIBRARIES
-        ${ATK_LIBRARIES}
-    )
-endif ()
-
-# FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory
-# structure. See <https://bugs.webkit.org/show_bug.cgi?id=81475>.
-add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
-                -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3")
-
-include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})
-
-add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
-target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
-set_target_properties(DumpRenderTree PROPERTIES FOLDER "Tools")