Skip to content

Commit 45415bc

Browse files
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 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219492 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 3523425 commit 45415bc

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

Tools/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2017-07-13 Matthew Hanson <[email protected]>
2+
3+
Use the old WebKit/WebKit2 targets for CMake builds.
4+
5+
Unreviewed build fix.
6+
7+
We can update the target names to match the Framework names in a future patch.
8+
This is a partial revert of r219489.
9+
10+
* TestWebKitAPI/CMakeLists.txt:
11+
WebKitLegacy => WebKit
12+
WebKit => WebKit2
13+
114
2017-07-13 Matthew Hanson <[email protected]>
215

316
Fix TestWebKit API.

Tools/TestWebKitAPI/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ if (ENABLE_WEBKIT2)
1919
JavaScriptCore
2020
TestWebKitAPIBase
2121
WTF
22-
WebKit
22+
WebKit2
2323
gtest
2424
)
2525
list(APPEND TestWebKitAPI_LIBRARIES
26-
WebKitLegacy
26+
WebKit
2727
)
2828
else ()
2929
list(APPEND TestWebKitAPI_LIBRARIES
30-
WebKitLegacy${DEBUG_SUFFIX}
30+
WebKit${DEBUG_SUFFIX}
3131
)
3232
endif ()
3333

@@ -205,9 +205,9 @@ if (ENABLE_WEBKIT2)
205205
${TESTWEBKITAPI_DIR}/TestsController.cpp
206206
)
207207

208-
target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit gtest)
208+
target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit2 gtest)
209209

210-
add_dependencies(TestWebKitAPIBase WebKit ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
210+
add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
211211

212212
foreach (testName ${test_webkit2_api_BINARIES})
213213
get_filename_component(testBaseName ${testName} NAME)

0 commit comments

Comments
 (0)