[GTK][WPE] TestWTF and TestJSC fail to compile due to missing forwarding headers
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Jul 2018 18:24:04 +0000 (18:24 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Jul 2018 18:24:04 +0000 (18:24 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184441

Reviewed by Michael Catanzaro.

All executables of TestWebKitAPI need the forwarding headers of
WebCore and PAL because config.h includes
<WebCore/PlatformExportMacros.h> and <pal/ExportMacros.h>.

The forwarding headers of WebCore are generated by
generate-forwarding-headers.pl in GTK and WPE ports. The
forwarding headers of PAL are generated by
WEBKIT_MAKE_FORWARDING_HEADERS in all CMake ports.

* TestWebKitAPI/PlatformGTK.cmake: Added PALForwardingHeaders to
ForwardingHeadersForTestWebKitAPI_NAME. Added dependencies of
${ForwardingHeadersForTestWebKitAPI_NAME} to TestJSC.
* TestWebKitAPI/PlatformWPE.cmake: Ditto.

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

Tools/ChangeLog
Tools/TestWebKitAPI/PlatformGTK.cmake
Tools/TestWebKitAPI/PlatformWPE.cmake

index 49bea41..6627894 100644 (file)
@@ -1,3 +1,24 @@
+2018-07-10  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [GTK][WPE] TestWTF and TestJSC fail to compile due to missing forwarding headers
+        https://bugs.webkit.org/show_bug.cgi?id=184441
+
+        Reviewed by Michael Catanzaro.
+
+        All executables of TestWebKitAPI need the forwarding headers of
+        WebCore and PAL because config.h includes
+        <WebCore/PlatformExportMacros.h> and <pal/ExportMacros.h>.
+
+        The forwarding headers of WebCore are generated by
+        generate-forwarding-headers.pl in GTK and WPE ports. The
+        forwarding headers of PAL are generated by
+        WEBKIT_MAKE_FORWARDING_HEADERS in all CMake ports.
+
+        * TestWebKitAPI/PlatformGTK.cmake: Added PALForwardingHeaders to
+        ForwardingHeadersForTestWebKitAPI_NAME. Added dependencies of
+        ${ForwardingHeadersForTestWebKitAPI_NAME} to TestJSC.
+        * TestWebKitAPI/PlatformWPE.cmake: Ditto.
+
 2018-07-10  Stephan Szabo  <stephan.szabo@sony.com>
 
         [WinCairo] Support display of webinspector ui on non-legacy minibrowser
index 2741035..b0ed8f8 100644 (file)
@@ -10,7 +10,7 @@ add_custom_target(TestWebKitAPI-forwarding-headers
     DEPENDS WebKit-forwarding-headers
 )
 
-set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers)
+set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers PALForwardingHeaders)
 
 include_directories(
     ${FORWARDING_HEADERS_DIR}
@@ -125,6 +125,7 @@ target_link_libraries(TestJSC
     ${GLIB_LIBRARIES}
     JavaScriptCore
 )
+add_dependencies(TestJSC ${ForwardingHeadersForTestWebKitAPI_NAME})
 add_test(TestJSC ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore/TestJSC)
 set_tests_properties(TestJSC PROPERTIES TIMEOUT 60)
 set_target_properties(TestJSC PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore)
index 17c9f6f..7457c75 100644 (file)
@@ -10,7 +10,7 @@ add_custom_target(TestWebKitAPI-forwarding-headers
     DEPENDS webkitwpe-forwarding-headers
 )
 
-set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers)
+set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers PALForwardingHeaders)
 
 include_directories(
     ${FORWARDING_HEADERS_DIR}
@@ -98,6 +98,7 @@ target_link_libraries(TestJSC
     JavaScriptCore
 )
 add_test(TestJSC ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore/TestJSC)
+add_dependencies(TestJSC ${ForwardingHeadersForTestWebKitAPI_NAME})
 set_tests_properties(TestJSC PROPERTIES TIMEOUT 60)
 set_target_properties(TestJSC PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore)