Failing to upload to flakiness dashboard should not be a hard error
[WebKit-https.git] / Tools / WebKitTestRunner / PlatformGTK.cmake
index c8a0160..84c9a86 100644 (file)
@@ -1,12 +1,12 @@
+add_custom_target(WebKitTestRunner-forwarding-headers
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
+)
+
 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
@@ -15,7 +15,10 @@ list(APPEND WebKitTestRunner_SOURCES
 
 list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     ${FORWARDING_HEADERS_DIR}
-    ${WTF_DIR}/wtf/gobject
+    ${WTF_DIR}/wtf/glib
+)
+
+list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
     ${ATK_INCLUDE_DIRS}
     ${CAIRO_INCLUDE_DIRS}
     ${GTK3_INCLUDE_DIRS}
@@ -55,20 +58,3 @@ add_definitions(
     -DFONTS_CONF_DIR="${TOOLS_DIR}/WebKitTestRunner/gtk/fonts"
     -DTOP_LEVEL_DIR="${CMAKE_SOURCE_DIR}"
 )
-
-file(GLOB_RECURSE WebKitTestRunner_HEADERS
-    *.h
-)
-
-add_custom_command(
-    OUTPUT ${CMAKE_BINARY_DIR}/WebKitTestRunner-forwarding-headers.stamp
-    DEPENDS ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl
-            ${WebKitTestRunner_SOURCES}
-            ${WebKitTestRunner_HEADERS}
-            ${WebKitTestRunnerInjectedBundle_SOURCES}
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
-    COMMAND touch ${CMAKE_BINARY_DIR}/WebKitTestRunner-forwarding-headers.stamp
-)
-add_custom_target(WebKitTestRunner-forwarding-headers
-    DEPENDS ${CMAKE_BINARY_DIR}/WebKitTestRunner-forwarding-headers.stamp
-)