Title: [219492] trunk/Tools
- Revision
- 219492
- Author
- matthew_han...@apple.com
- Date
- 2017-07-13 19:56:11 -0700 (Thu, 13 Jul 2017)
Log 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
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (219491 => 219492)
--- trunk/Tools/ChangeLog 2017-07-14 02:53:24 UTC (rev 219491)
+++ trunk/Tools/ChangeLog 2017-07-14 02:56:11 UTC (rev 219492)
@@ -1,5 +1,18 @@
2017-07-13 Matthew Hanson <matthew_han...@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_han...@apple.com>
+
Fix TestWebKit API.
https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (219491 => 219492)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2017-07-14 02:53:24 UTC (rev 219491)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2017-07-14 02:56:11 UTC (rev 219492)
@@ -19,15 +19,15 @@
_javascript_Core
TestWebKitAPIBase
WTF
- WebKit
+ WebKit2
gtest
)
list(APPEND TestWebKitAPI_LIBRARIES
- WebKitLegacy
+ WebKit
)
else ()
list(APPEND TestWebKitAPI_LIBRARIES
- WebKitLegacy${DEBUG_SUFFIX}
+ WebKit${DEBUG_SUFFIX}
)
endif ()
@@ -205,9 +205,9 @@
${TESTWEBKITAPI_DIR}/TestsController.cpp
)
- target_link_libraries(TestWebKitAPIBase _javascript_Core WTF WebKit gtest)
+ target_link_libraries(TestWebKitAPIBase _javascript_Core WTF WebKit2 gtest)
- add_dependencies(TestWebKitAPIBase WebKit ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
+ add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
foreach (testName ${test_webkit2_api_BINARIES})
get_filename_component(testBaseName ${testName} NAME)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
