Title: [161354] trunk/Source/WebKit2
- Revision
- 161354
- Author
- [email protected]
- Date
- 2014-01-06 11:01:30 -0800 (Mon, 06 Jan 2014)
Log Message
[GTK] [CMake] Parallel builds still fail when building WebKit2 GObject API unit tests
https://bugs.webkit.org/show_bug.cgi?id=126465
Reviewed by Gustavo Noronha Silva.
* UIProcess/API/gtk/tests/CMakeLists.txt: Explicitly link the libWebKit2APITestCore static object against
WebKit2, which seems to be necessary on my new system. Also create an explicit dependency between the
injected bundle tests and WebKit2, because they need to use the generated headers.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (161353 => 161354)
--- trunk/Source/WebKit2/ChangeLog 2014-01-06 18:56:26 UTC (rev 161353)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-06 19:01:30 UTC (rev 161354)
@@ -1,3 +1,14 @@
+2014-01-06 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Parallel builds still fail when building WebKit2 GObject API unit tests
+ https://bugs.webkit.org/show_bug.cgi?id=126465
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * UIProcess/API/gtk/tests/CMakeLists.txt: Explicitly link the libWebKit2APITestCore static object against
+ WebKit2, which seems to be necessary on my new system. Also create an explicit dependency between the
+ injected bundle tests and WebKit2, because they need to use the generated headers.
+
2014-01-06 László Langó <[email protected]>
Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt (161353 => 161354)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt 2014-01-06 18:56:26 UTC (rev 161353)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt 2014-01-06 19:01:30 UTC (rev 161354)
@@ -33,8 +33,9 @@
TestMain.cpp
WebViewTest.cpp
)
-add_dependencies(WebKit2APITestCore WebKit2)
+target_link_libraries(WebKit2APITestCore WebKit2)
+
add_custom_target(test-gresource-bundle
DEPENDS resources/webkit2gtk-tests.gresource.xml
resources/link-title.js
@@ -43,6 +44,7 @@
macro(ADD_WK2_TEST_WEB_EXTENSION extension_name)
add_library(${extension_name} MODULE ${ARGN})
+ add_dependencies(${extension_name} WebKit2)
set_property(
TARGET ${extension_name}
APPEND
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
