Title: [185281] trunk/Tools
- Revision
- 185281
- Author
- gyuyoung....@webkit.org
- Date
- 2015-06-05 18:19:36 -0700 (Fri, 05 Jun 2015)
Log Message
[EFL] API test has been broken since r184357
https://bugs.webkit.org/show_bug.cgi?id=145635
Reviewed by Darin Adler.
r184357 suppress cmake build warning using TARGET_FILE property. However
many EFL API test cases have been broken after applying it.
* TestWebKitAPI/CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (185280 => 185281)
--- trunk/Tools/ChangeLog 2015-06-06 01:18:37 UTC (rev 185280)
+++ trunk/Tools/ChangeLog 2015-06-06 01:19:36 UTC (rev 185281)
@@ -1,3 +1,15 @@
+2015-06-05 Gyuyoung Kim <gyuyoung....@webkit.org>
+
+ [EFL] API test has been broken since r184357
+ https://bugs.webkit.org/show_bug.cgi?id=145635
+
+ Reviewed by Darin Adler.
+
+ r184357 suppress cmake build warning using TARGET_FILE property. However
+ many EFL API test cases have been broken after applying it.
+
+ * TestWebKitAPI/CMakeLists.txt:
+
2015-06-05 Anders Carlsson <ander...@apple.com>
Make the network cache directory part of WKContextConfigurationRef
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (185280 => 185281)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-06-06 01:18:37 UTC (rev 185280)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-06-06 01:19:36 UTC (rev 185281)
@@ -130,9 +130,11 @@
target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})
add_dependencies(TestWebKitAPIInjectedBundle ${ForwardingHeadersForTestWebKitAPI_NAME})
+get_property(TestWebKitAPIInjectedBundle_PATH TARGET TestWebKitAPIInjectedBundle PROPERTY LOCATION)
+
add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1 -DGTEST_HAS_RTTI=0
-DTEST_WEBKIT2_RESOURCES_DIR=\"${TESTWEBKITAPI_DIR}/Tests/WebKit2\"
- -DTEST_INJECTED_BUNDLE_PATH=\"$<TARGET_FILE_DIR:TestWebKitAPIInjectedBundle>\"
+ -DTEST_INJECTED_BUNDLE_PATH=\"${TestWebKitAPIInjectedBundle_PATH}\"
)
# FIXME: This works around compatibility problems in the old version of the third-pary
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
