<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[199257] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199257">199257</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-04-08 17:36:06 -0700 (Fri, 08 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards running CMake WebKit2 on Mac
https://bugs.webkit.org/show_bug.cgi?id=156426
Reviewed by Tim Horton.
.:
* Source/cmake/OptionsMac.cmake:
FTL works on Mac, so let's use it.
* Source/cmake/WebKitMacros.cmake:
Source/JavaScriptCore:
* PlatformMac.cmake:
Source/WebCore:
* CMakeLists.txt:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWin.cmake:
On Mac, WTF is a static library that is linked only with JavaScriptCore.
Source/WebKit:
* CMakeLists.txt:
* PlatformMac.cmake:
* PlatformWin.cmake:
Source/WebKit2:
* CMakeLists.txt:
* PlatformMac.cmake:
Put the xpc service binaries in the right place.
Source/WTF:
* wtf/PlatformMac.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformMaccmake">trunk/Source/JavaScriptCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformMaccmake">trunk/Source/WTF/wtf/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebKitCMakeListstxt">trunk/Source/WebKit/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-08 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * Source/cmake/OptionsMac.cmake:
+ FTL works on Mac, so let's use it.
+ * Source/cmake/WebKitMacros.cmake:
+
</ins><span class="cx"> 2016-04-07 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(ENABLE_ES6_CLASS_SYNTAX) guards
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-08 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2016-04-08 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Debugger may dereference m_currentCallFrame even after the VM has gone idle
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -39,6 +39,8 @@
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
+
</ins><span class="cx"> # FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
</span><span class="cx"> if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h)
</span><span class="cx"> file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h "#include \"inspector/InspectorBackendDispatchers.h\"")
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WTF/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-08 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * wtf/PlatformMac.cmake:
+
</ins><span class="cx"> 2016-04-08 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Enable Concurrent JIT by default
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-set(WTF_LIBRARY_TYPE SHARED)
</del><ins>+set(WTF_LIBRARY_TYPE STATIC)
</ins><span class="cx">
</span><span class="cx"> find_library(COCOA_LIBRARY Cocoa)
</span><span class="cx"> find_library(COREFOUNDATION_LIBRARY CoreFoundation)
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -2969,7 +2969,6 @@
</span><span class="cx"> set(WebCore_LIBRARIES
</span><span class="cx"> ${ICU_LIBRARIES}
</span><span class="cx"> JavaScriptCore${DEBUG_SUFFIX}
</span><del>- WTF${DEBUG_SUFFIX}
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (ENABLE_ENCRYPTED_MEDIA OR ENABLE_ENCRYPTED_MEDIA_V2)
</span><span class="lines">@@ -3420,7 +3419,6 @@
</span><span class="cx">
</span><span class="cx"> set(WebCoreTestSupport_LIBRARIES
</span><span class="cx"> PRIVATE JavaScriptCore${DEBUG_SUFFIX}
</span><del>- PRIVATE WTF${DEBUG_SUFFIX}
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Modules that the bindings generator scripts may use
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebCore/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-08 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+ On Mac, WTF is a static library that is linked only with JavaScriptCore.
+
</ins><span class="cx"> 2016-04-08 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed 32-bit build fix; make type of std::min<> explicit.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -280,8 +280,11 @@
</span><span class="cx"> ${X11_Xrender_LIB}
</span><span class="cx"> ${X11_Xt_LIB}
</span><span class="cx"> ${ZLIB_LIBRARIES}
</span><ins>+ WTF
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+list(APPEND WebCoreTestSupport_LIBRARIES WTF)
+
</ins><span class="cx"> list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><span class="cx"> ${ATK_INCLUDE_DIRS}
</span><span class="cx"> ${CAIRO_INCLUDE_DIRS}
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -934,3 +934,5 @@
</span><span class="cx"> testing/MockContentFilter.cpp
</span><span class="cx"> testing/MockContentFilterSettings.cpp
</span><span class="cx"> )
</span><ins>+
+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
</ins></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebCore/PlatformWin.cmake 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -307,3 +307,6 @@
</span><span class="cx"> set(WebCore_OUTPUT_NAME
</span><span class="cx"> WebCore${DEBUG_SUFFIX}
</span><span class="cx"> )
</span><ins>+
+list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
+list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})
</ins></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit/CMakeLists.txt 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx">
</span><span class="cx"> set(WebKit_LIBRARIES
</span><span class="cx"> PRIVATE JavaScriptCore${DEBUG_SUFFIX}
</span><del>- PRIVATE WTF${DEBUG_SUFFIX}
</del><span class="cx"> PRIVATE WebCore${DEBUG_SUFFIX}
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-08 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+
</ins><span class="cx"> 2016-04-08 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [cmake] Use ICU include dirs in WebKit.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -388,3 +388,5 @@
</span><span class="cx"> file(WRITE ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/${_file} "#import <WebCore/${_file}>")
</span><span class="cx"> endif ()
</span><span class="cx"> endforeach ()
</span><ins>+
+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
</ins></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit/PlatformWin.cmake 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+list(APPEND WebKit_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
+
</ins><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitVersion.h
</span><span class="cx"> MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -903,6 +903,7 @@
</span><span class="cx"> add_custom_target(WebContentProcessNib COMMAND
</span><span class="cx"> ibtool --compile ${_web_xpc_dir}/Resources/WebContentProcess.nib ${WEBKIT2_DIR}/Resources/WebContentProcess.xib
</span><span class="cx"> VERBATIM)
</span><ins>+ add_dependencies(WebKit2 WebContentProcessNib)
</ins><span class="cx">
</span><span class="cx"> # FIXME: This shouldn't be two operations.
</span><span class="cx"> file(COPY ${WEBKIT2_DIR}/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist DESTINATION ${_web_xpc_dir})
</span><span class="lines">@@ -913,7 +914,6 @@
</span><span class="cx">
</span><span class="cx"> set(_net_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.Networking.Development.xpc/Contents)
</span><span class="cx"> make_directory(${_net_xpc_dir}/MacOS)
</span><del>- make_directory(${_net_xpc_dir}/Resources)
</del><span class="cx"> make_directory(${_net_xpc_dir}/_CodeSignature)
</span><span class="cx">
</span><span class="cx"> # FIXME: This shouldn't be two operations.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-04-08 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Progress towards running CMake WebKit2 on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=156426
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ Put the xpc service binaries in the right place.
+
+2016-04-08 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Build fix with IndexedDB disabled but DatabaseProcess enabled after r199230
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156321
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -417,10 +417,6 @@
</span><span class="cx"> "${WEBCORE_DIR}/page"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(WEBKIT2_EXTRA_DEPENDENCIES
- WebKit2-forwarding-headers
-)
-
</del><span class="cx"> set(XPCService_SOURCES
</span><span class="cx"> Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
</span><span class="cx"> Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
</span><span class="lines">@@ -447,8 +443,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # FIXME: These should not have Development in production builds.
</span><del>-set(WebKit2_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development.xpc)
-set(WebKit2_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development.xpc)
</del><ins>+set(WebKit2_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development)
+set(WebKit2_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)
</ins><span class="cx">
</span><span class="cx"> add_definitions("-include WebKit2Prefix.h")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/cmake/OptionsMac.cmake 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE OFF)
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE OFF)
</del><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY PRIVATE OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (199256 => 199257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2016-04-09 00:33:12 UTC (rev 199256)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-04-09 00:36:06 UTC (rev 199257)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> add_custom_command(TARGET ${_target} POST_BUILD COMMAND ${${_target}_POST_BUILD_COMMAND} VERBATIM)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>- if (APPLE AND NOT PORT STREQUAL "GTK")
</del><ins>+ if (APPLE AND NOT PORT STREQUAL "GTK" AND NOT ${_target} STREQUAL "WTF")
</ins><span class="cx"> set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)
</span><span class="cx"> install(TARGETS ${_target} FRAMEWORK DESTINATION ${LIB_INSTALL_DIR})
</span><span class="cx"> endif ()
</span></span></pre>
</div>
</div>
</body>
</html>