[Web Animations] Expose Web Animations CSS integration as an experimental feature
[WebKit-https.git] / Tools / WebKitTestRunner / PlatformGTK.cmake
index 873458a..b0af11e 100644 (file)
@@ -1,20 +1,12 @@
-add_custom_target(gtk-forwarding-headers-for-WebKitTestRunner
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include gtk
+add_custom_target(WebKitTestRunner-forwarding-headers
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --include-path ${WEBKIT_TESTRUNNER_SHARED_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
 )
-set(ForwardingHeadersForWebKitTestRunner_NAME gtk-forwarding-headers-for-WebKitTestRunner)
 
-add_custom_target(soup-forwarding-headers-for-WebKitTestRunner
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
-)
-set(ForwardingNetworkHeadersForWebKitTestRunner_NAME soup-forwarding-headers-for-WebKitTestRunner)
+set(ForwardingHeadersForWebKitTestRunner_NAME WebKitTestRunner-forwarding-headers)
 
 list(APPEND WebKitTestRunner_SOURCES
     ${WEBKIT_TESTRUNNER_DIR}/cairo/TestInvocationCairo.cpp
 
-    ${WEBKIT_TESTRUNNER_DIR}/gtk/TestControllerGtk.cpp
-    ${WEBKIT_TESTRUNNER_DIR}/gtk/PlatformWebViewGtk.cpp
-    ${WEBKIT_TESTRUNNER_DIR}/gtk/EventSenderProxyGtk.cpp
-
     ${WEBKIT_TESTRUNNER_DIR}/gtk/EventSenderProxyGtk.cpp
     ${WEBKIT_TESTRUNNER_DIR}/gtk/PlatformWebViewGtk.cpp
     ${WEBKIT_TESTRUNNER_DIR}/gtk/TestControllerGtk.cpp
@@ -22,7 +14,10 @@ list(APPEND WebKitTestRunner_SOURCES
 )
 
 list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
-    ${WTF_DIR}/wtf/gobject
+    ${FORWARDING_HEADERS_DIR}
+)
+
+list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
     ${ATK_INCLUDE_DIRS}
     ${CAIRO_INCLUDE_DIRS}
     ${GTK3_INCLUDE_DIRS}
@@ -35,6 +30,7 @@ list(APPEND WebKitTestRunner_LIBRARIES
     ${GTK3_LIBRARIES}
     ${GLIB_LIBRARIES}
     WTF
+    WebCore
     WebCorePlatformGTK
 )
 
@@ -44,7 +40,7 @@ set(WebKitTestRunnerInjectedBundle_LIBRARIES
     ${GLIB_LIBRARIES}
     ${GTK3_LIBRARIES}
     WebCoreTestSupport
-    WebKit2
+    WebKit
 )
 
 list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
@@ -59,6 +55,6 @@ list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
 )
 
 add_definitions(
-    -DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
+    -DFONTS_CONF_DIR="${TOOLS_DIR}/WebKitTestRunner/gtk/fonts"
     -DTOP_LEVEL_DIR="${CMAKE_SOURCE_DIR}"
 )