Changeset 219492 in webkit

Timestamp:

Jul 13, 2017 7:56:11 PM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Use the old WebKit/WebKit2 targets for CMake builds.

Unreviewed build fix.

We can update the target names to match the Framework names in a future patch.
This is a partial revert of r219489.

• TestWebKitAPI/CMakeLists.txt:

WebKitLegacy => WebKit
WebKit => WebKit2

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/CMakeLists.txt (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Use the old WebKit/WebKit2 targets for CMake builds.
+
+        Unreviewed build fix.
+
+        We can update the target names to match the Framework names in a future patch.
+        This is a partial revert of r219489.
+
+        * TestWebKitAPI/CMakeLists.txt:
+        WebKitLegacy => WebKit
+        WebKit => WebKit2
+
 2017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
 

trunk/Tools/TestWebKitAPI/CMakeLists.txt

@@ -20 +20 @@
         TestWebKitAPIBase
         WTF
+        WebKit2
+        gtest
+    )
+    list(APPEND TestWebKitAPI_LIBRARIES
         WebKit
-        gtest
-    )
-    list(APPEND TestWebKitAPI_LIBRARIES
-        WebKitLegacy
     )
 else ()
     list(APPEND TestWebKitAPI_LIBRARIES
-        WebKitLegacy${DEBUG_SUFFIX}
+        WebKit${DEBUG_SUFFIX}
     )
 endif ()
@@ -206 +206 @@
     )
 
-    target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit gtest)
-
-    add_dependencies(TestWebKitAPIBase WebKit ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
+    target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit2 gtest)
+
+    add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
 
     foreach (testName ${test_webkit2_api_BINARIES})