Title: [223884] trunk/Source/WebKit
- Revision
- 223884
- Author
- [email protected]
- Date
- 2017-10-24 01:20:03 -0700 (Tue, 24 Oct 2017)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (223883 => 223884)
--- trunk/Source/WebKit/ChangeLog 2017-10-24 07:51:59 UTC (rev 223883)
+++ trunk/Source/WebKit/ChangeLog 2017-10-24 08:20:03 UTC (rev 223884)
@@ -1,3 +1,17 @@
+2017-10-24 Zan Dobersek <[email protected]>
+
+ [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 <[email protected]>
[Cocoa] Web Automation: add SPI to tell whether the automation session is currently simulating user interactions
Modified: trunk/Source/WebKit/PlatformGTK.cmake (223883 => 223884)
--- trunk/Source/WebKit/PlatformGTK.cmake 2017-10-24 07:51:59 UTC (rev 223883)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2017-10-24 08:20:03 UTC (rev 223884)
@@ -1303,7 +1303,8 @@
)
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.
Modified: trunk/Source/WebKit/PlatformWPE.cmake (223883 => 223884)
--- trunk/Source/WebKit/PlatformWPE.cmake 2017-10-24 07:51:59 UTC (rev 223883)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2017-10-24 08:20:03 UTC (rev 223884)
@@ -20,7 +20,8 @@
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.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes