Title: [134424] trunk/Tools
- Revision
- 134424
- Author
- [email protected]
- Date
- 2012-11-13 08:42:53 -0800 (Tue, 13 Nov 2012)
Log Message
[CMake] Incorrect dependency calculation when generating forwarding headers
https://bugs.webkit.org/show_bug.cgi?id=102076
Reviewed by Kenneth Rohde Christiansen.
Explicitly call generate-forwarding-headers.pl on ${WEBKIT2_DIR} as
well, since some dependencies pulled in via the WebKit2/WebKit2_C.h
include in config.h are only generated from there.
This is a bit redundant since this is also done in WebKit2's
PlatformEfl.cmake, however the WTF and WebCore API tests do not depend
on WebKit2 so the script may not have been called when these tests are
being built.
* TestWebKitAPI/PlatformEfl.cmake:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (134423 => 134424)
--- trunk/Tools/ChangeLog 2012-11-13 16:15:43 UTC (rev 134423)
+++ trunk/Tools/ChangeLog 2012-11-13 16:42:53 UTC (rev 134424)
@@ -1,3 +1,21 @@
+2012-11-13 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Incorrect dependency calculation when generating forwarding headers
+ https://bugs.webkit.org/show_bug.cgi?id=102076
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Explicitly call generate-forwarding-headers.pl on ${WEBKIT2_DIR} as
+ well, since some dependencies pulled in via the WebKit2/WebKit2_C.h
+ include in config.h are only generated from there.
+
+ This is a bit redundant since this is also done in WebKit2's
+ PlatformEfl.cmake, however the WTF and WebCore API tests do not depend
+ on WebKit2 so the script may not have been called when these tests are
+ being built.
+
+ * TestWebKitAPI/PlatformEfl.cmake:
+
2012-11-13 Zeno Albisser <[email protected]>
Unreviewed: Adding watchlist definition for CoordinatedGraphics.
Modified: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (134423 => 134424)
--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2012-11-13 16:15:43 UTC (rev 134423)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2012-11-13 16:42:53 UTC (rev 134424)
@@ -1,9 +1,11 @@
ADD_CUSTOM_TARGET(forwarding-headersEflForTestWebKitAPI
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
)
SET(ForwardingHeadersForTestWebKitAPI_NAME forwarding-headersEflForTestWebKitAPI)
ADD_CUSTOM_TARGET(forwarding-headersSoupForTestWebKitAPI
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
)
SET(ForwardingNetworkHeadersForTestWebKitAPI_NAME forwarding-headersSoupForTestWebKitAPI)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
