Title: [199753] trunk/Source/WebKit2
- Revision
- 199753
- Author
- achristen...@apple.com
- Date
- 2016-04-19 18:36:02 -0700 (Tue, 19 Apr 2016)
Log Message
Fix CMake build.
* CMakeLists.txt:
Don't compile a file that doesn't exist.
* PlatformMac.cmake:
Put the XPCServices in the right place.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (199752 => 199753)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-04-20 01:33:34 UTC (rev 199752)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-04-20 01:36:02 UTC (rev 199753)
@@ -894,7 +894,7 @@
endif ()
if ("${PORT}" STREQUAL "Mac")
- set(_web_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.Development.xpc/Contents)
+ set(_web_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc/Contents)
make_directory(${_web_xpc_dir}/MacOS)
make_directory(${_web_xpc_dir}/Resources)
make_directory(${_web_xpc_dir}/_CodeSignature)
@@ -911,7 +911,7 @@
set_target_properties(WebProcess PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${_web_xpc_dir}/MacOS")
- set(_net_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.Networking.Development.xpc/Contents)
+ set(_net_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc/Contents)
make_directory(${_net_xpc_dir}/MacOS)
make_directory(${_net_xpc_dir}/_CodeSignature)
Modified: trunk/Source/WebKit2/ChangeLog (199752 => 199753)
--- trunk/Source/WebKit2/ChangeLog 2016-04-20 01:33:34 UTC (rev 199752)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-20 01:36:02 UTC (rev 199753)
@@ -1,3 +1,12 @@
+2016-04-19 Alex Christensen <achristen...@webkit.org>
+
+ Fix CMake build.
+
+ * CMakeLists.txt:
+ Don't compile a file that doesn't exist.
+ * PlatformMac.cmake:
+ Put the XPCServices in the right place.
+
2016-04-19 Chris Dumez <cdu...@apple.com>
Crash under WebKit::PluginView::pluginSnapshotTimerFired
Modified: trunk/Source/WebKit2/PlatformMac.cmake (199752 => 199753)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-04-20 01:33:34 UTC (rev 199752)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-04-20 01:36:02 UTC (rev 199753)
@@ -73,7 +73,6 @@
Shared/API/Cocoa/WKRemoteObject.mm
Shared/API/Cocoa/WKRemoteObjectCoder.mm
Shared/API/Cocoa/WebKit.m
- Shared/API/Cocoa/_WKExperimentalFeature.mm
Shared/API/Cocoa/_WKFrameHandle.mm
Shared/API/Cocoa/_WKHitTestResult.mm
Shared/API/Cocoa/_WKNSFileManagerExtras.mm
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
