[GTK][WPE] generate-forwarding-headers.pl should also scan derived sources in WebKit...
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Oct 2017 08:20:03 +0000 (08:20 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Oct 2017 08:20:03 +0000 (08:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=178579

Reviewed by Carlos Garcia Campos.

* PlatformGTK.cmake: When generating forwarding headers, derived sources
should be scanned as well. The DERIVED_SOURCES_WEBKIT_DIR value has to
be passed as an include path to the generate-forward-headers.pl script
to achieve that. This target then also has to depend on all the derived
source files to be generated before this can be performed.
* PlatformWPE.cmake: Ditto.

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

Source/WebKit/ChangeLog
Source/WebKit/PlatformGTK.cmake
Source/WebKit/PlatformWPE.cmake

index 71f444d..2f29316 100644 (file)
@@ -1,3 +1,17 @@
+2017-10-24  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK][WPE] generate-forwarding-headers.pl should also scan derived sources in WebKit framework
+        https://bugs.webkit.org/show_bug.cgi?id=178579
+
+        Reviewed by Carlos Garcia Campos.
+
+        * PlatformGTK.cmake: When generating forwarding headers, derived sources
+        should be scanned as well. The DERIVED_SOURCES_WEBKIT_DIR value has to
+        be passed as an include path to the generate-forward-headers.pl script
+        to achieve that. This target then also has to depend on all the derived
+        source files to be generated before this can be performed.
+        * PlatformWPE.cmake: Ditto.
+
 2017-10-23  Brian Burg  <bburg@apple.com>
 
         [Cocoa] Web Automation: add SPI to tell whether the automation session is currently simulating user interactions
index b5f9436..d0c289c 100644 (file)
@@ -1303,7 +1303,8 @@ file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkitdom.cfg
 )
 
 add_custom_target(WebKit-forwarding-headers
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
+    DEPENDS ${WebKit_DERIVED_SOURCES}
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --include-path ${DERIVED_SOURCES_WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
 )
 
 # These symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
index f7ac700..71171b7 100644 (file)
@@ -20,7 +20,8 @@ file(REMOVE "${FORWARDING_HEADERS_DIR}/WebCore/Settings.h")
 set(WebKit_USE_PREFIX_HEADER ON)
 
 add_custom_target(webkitwpe-forwarding-headers
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup
+    DEPENDS ${WebKit_DERIVED_SOURCES}
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --include-path ${DERIVED_SOURCES_WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup
 )
 
  # These symbolic link allows includes like #include <wpe/WebkitWebView.h> which simulates installed headers.