Changeset 161354 in webkit

Timestamp:

Jan 6, 2014 11:01:30 AM (10 years ago)

Author:

Martin Robinson

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/tests/CMakeLists.txt (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-06  Martin Robinson  <mrobinson@igalia.com>
+
+        [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ó  <lango@inf.u-szeged.hu>
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt

@@ -34 +34 @@
     WebViewTest.cpp
 )
-add_dependencies(WebKit2APITestCore WebKit2)
+
+target_link_libraries(WebKit2APITestCore WebKit2)
 
 add_custom_target(test-gresource-bundle
@@ -44 +45 @@
 macro(ADD_WK2_TEST_WEB_EXTENSION extension_name)
     add_library(${extension_name} MODULE ${ARGN})
+    add_dependencies(${extension_name} WebKit2)
     set_property(
         TARGET ${extension_name}