<!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>[181496] 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/181496">181496</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-13 19:57:54 -0700 (Fri, 13 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards CMake on Mac.
https://bugs.webkit.org/show_bug.cgi?id=142680
Reviewed by Gyuyoung Kim.
.:
* CMakeLists.txt:
* Source/PlatformMac.cmake: Added stub.
* Source/cmake/OptionsMac.cmake:
Change defines to get CMake working.
Source/bmalloc:
* CMakeLists.txt:
* PlatformMac.cmake:
Added Zone.cpp to Mac CMake builds.
Source/JavaScriptCore:
* PlatformMac.cmake:
Generate TracingDtrace.h based on project.pbxproj.
Source/WebCore:
* PlatformMac.cmake:
Added new include directories and removed old source files.
Source/WebKit:
* CMakeLists.txt: Added.
Source/WebKit2:
* PlatformMac.cmake: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocCMakeListstxt">trunk/Source/bmalloc/CMakeLists.txt</a></li>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourcePlatformMaccmake">trunk/Source/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitCMakeListstxt">trunk/Source/WebKit/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkSourcebmallocPlatformMaccmake">trunk/Source/bmalloc/PlatformMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/CMakeLists.txt 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -132,6 +132,7 @@
</span><span class="cx"> set(WebCore_LIBRARY_TYPE STATIC)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+set(WebKit_LIBRARY_TYPE SHARED)
</ins><span class="cx"> set(WebKit2_LIBRARY_TYPE SHARED)
</span><span class="cx"> set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-03-13 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=142680
+
+ Reviewed by Gyuyoung Kim.
+
+ * CMakeLists.txt:
+ * Source/PlatformMac.cmake: Added stub.
+ * Source/cmake/OptionsMac.cmake:
+ Change defines to get CMake working.
+
</ins><span class="cx"> 2015-03-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add an option to enable MiniBrowser for non developer builds and always install it
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-13 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=142680
+
+ Reviewed by Gyuyoung Kim.
+
+ * PlatformMac.cmake:
+ Generate TracingDtrace.h based on project.pbxproj.
+
</ins><span class="cx"> 2015-03-13 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Object allocation sinking phase shouldn't re-decorate previously sunken allocations on each fixpoint operation
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -24,3 +24,17 @@
</span><span class="cx"> inspector/remote/RemoteInspectorXPCConnection.mm
</span><span class="cx"> )
</span><span class="cx"> add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
</span><ins>+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
+ DEPENDS ${JAVASCRIPTCORE_DIR}/runtime/Tracing.d
+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+ COMMAND dtrace -h -o "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h" -s "${JAVASCRIPTCORE_DIR}/runtime/Tracing.d";
+ VERBATIM)
+
+list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+ ${JAVASCRIPTCORE_DIR}/disassembler/udis86
+)
+list(APPEND JavaScriptCore_HEADERS
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
+)
</ins></span></pre></div>
<a id="trunkSourcePlatformMaccmake"></a>
<div class="addfile"><h4>Added: trunk/Source/PlatformMac.cmake (0 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformMac.cmake (rev 0)
+++ trunk/Source/PlatformMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+# FIXME: Put platform-specific things here
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/WebCore/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-13 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=142680
+
+ Reviewed by Gyuyoung Kim.
+
+ * PlatformMac.cmake:
+ Added new include directories and removed old source files.
+
</ins><span class="cx"> 2015-03-13 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r181483.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -18,12 +18,16 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/cg"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/mac"
</span><ins>+ "${WEBCORE_DIR}/platform/mac"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/network/cocoa"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/mac"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/mac"
</span><del>- "${WEBCORE_DIR}/platform/mac"
</del><ins>+ "${WEBCORE_DIR}/platform/spi/cf"
+ "${WEBCORE_DIR}/platform/spi/cg"
+ "${WEBCORE_DIR}/platform/spi/cocoa"
+ "${WEBCORE_DIR}/platform/spi/mac"
</ins><span class="cx"> "${WEBCORE_DIR}/plugins/mac"
</span><span class="cx">
</span><span class="cx"> "/usr/include/libxslt"
</span><span class="lines">@@ -93,9 +97,7 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/opentype/OpenTypeMathData.cpp
</span><span class="cx">
</span><del>- platform/mac/AxisScrollSnapAnimator.mm
</del><span class="cx"> platform/mac/BlockExceptions.mm
</span><del>- platform/mac/ContentFilterMac.mm
</del><span class="cx"> platform/mac/ContextMenuItemMac.mm
</span><span class="cx"> platform/mac/ContextMenuMac.mm
</span><span class="cx"> platform/mac/CursorMac.mm
</span><span class="lines">@@ -109,10 +111,8 @@
</span><span class="cx"> platform/mac/KillRingMac.mm
</span><span class="cx"> platform/mac/Language.mm
</span><span class="cx"> platform/mac/LocalCurrentGraphicsContext.mm
</span><del>- platform/mac/LocalizedStringsMac.cpp
</del><span class="cx"> platform/mac/LoggingMac.mm
</span><span class="cx"> platform/mac/MIMETypeRegistryMac.mm
</span><del>- platform/mac/MediaTimeMac.cpp
</del><span class="cx"> platform/mac/NSScrollerImpDetails.mm
</span><span class="cx"> platform/mac/PasteboardMac.mm
</span><span class="cx"> platform/mac/PlatformClockCA.cpp
</span><span class="lines">@@ -123,10 +123,8 @@
</span><span class="cx"> platform/mac/PlatformSpeechSynthesisMac.mm
</span><span class="cx"> platform/mac/PlatformSpeechSynthesizerMac.mm
</span><span class="cx"> platform/mac/PublicSuffixMac.mm
</span><del>- platform/mac/PurgeableBufferMac.cpp
</del><span class="cx"> platform/mac/SSLKeyGeneratorMac.cpp
</span><span class="cx"> platform/mac/ScrollAnimatorMac.mm
</span><del>- platform/mac/ScrollController.mm
</del><span class="cx"> platform/mac/ScrollViewMac.mm
</span><span class="cx"> platform/mac/ScrollbarThemeMac.mm
</span><span class="cx"> platform/mac/SerializedPlatformRepresentationMac.mm
</span><span class="lines">@@ -216,6 +214,7 @@
</span><span class="cx"> platform/DisplaySleepDisabler.h
</span><span class="cx"> platform/mac/SoftLinking.h
</span><span class="cx"> platform/network/cf/ResourceResponse.h
</span><ins>+ platform/spi/cg/CoreGraphicsSPI.h
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
</span></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/CMakeLists.txt (0 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt (rev 0)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+# FIXME: Put Windows and Mac build files here.
+
+set(WebKit_SOURCES
+)
+
+set(WebKit_INCLUDE_DIRECTORIES
+)
+
+set(WebKit_LIBRARIES
+ JavaScriptCore
+ WTF
+ WebCore
+)
+
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
+include_directories(${WebKit_INCLUDE_DIRECTORIES})
+add_library(WebKit ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
+add_dependencies(WebKit WebCore)
+target_link_libraries(WebKit ${WebKit_LIBRARIES})
+set_target_properties(WebKit PROPERTIES FOLDER "WebKit")
+set_target_properties(WebKit PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
+if (WebKit_OUTPUT_NAME)
+ set_target_properties(WebKit PROPERTIES OUTPUT_NAME ${WebKit_OUTPUT_NAME})
+endif ()
+
+POPULATE_LIBRARY_VERSION(WEBKIT)
+set_target_properties(WebKit PROPERTIES VERSION ${WEBKIT_VERSION} SOVERSION ${WEBKIT_VERSION_MAJOR})
+install(TARGETS WebKit DESTINATION "${LIB_INSTALL_DIR}")
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/WebKit/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-03-13 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=142680
+
+ Reviewed by Gyuyoung Kim.
+
+ * CMakeLists.txt: Added.
+
</ins><span class="cx"> 2015-03-01 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Silence non-fatal errors about failing to create WebKitPluginHost.app and WebKitPluginAgent symlinks.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-03-13 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=142680
+
+ Reviewed by Gyuyoung Kim.
+
+ * PlatformMac.cmake: Added.
+
</ins><span class="cx"> 2015-03-13 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r181483.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/PlatformMac.cmake (0 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake (rev 0)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+#FIXME: Add Mac-specific sources here.
+
+set(WEBKIT2_EXTRA_DEPENDENCIES
+ WebKit2-forwarding-headers
+)
+set(WebProcess_SOURCES
+ WebProcess/mac/SecItemShimLibrary.mm
+)
</ins></span></pre></div>
<a id="trunkSourcebmallocCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/CMakeLists.txt (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/CMakeLists.txt 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/bmalloc/CMakeLists.txt 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -16,6 +16,8 @@
</span><span class="cx"> bmalloc/mbmalloc.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
</ins><span class="cx"> WEBKIT_WRAP_SOURCELIST(${bmalloc_SOURCES})
</span><span class="cx"> include_directories(${bmalloc_INCLUDE_DIRECTORIES})
</span><span class="cx"> add_library(bmalloc STATIC ${bmalloc_SOURCES})
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/bmalloc/ChangeLog 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-13 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=142680
+
+ Reviewed by Gyuyoung Kim.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ Added Zone.cpp to Mac CMake builds.
+
</ins><span class="cx"> 2015-03-12 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Assertion failure in bmalloc::LargeObject::validateSelf on Mavericks Debug layout test bot
</span></span></pre></div>
<a id="trunkSourcebmallocPlatformMaccmake"></a>
<div class="addfile"><h4>Added: trunk/Source/bmalloc/PlatformMac.cmake (0 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/PlatformMac.cmake (rev 0)
+++ trunk/Source/bmalloc/PlatformMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+list(APPEND bmalloc_SOURCES
+ bmalloc/Zone.cpp
+)
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (181495 => 181496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2015-03-14 02:50:36 UTC (rev 181495)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-03-14 02:57:54 UTC (rev 181496)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATA_TRANSFER_ITEMS OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DETAILS_ELEMENT ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION_iphoneos ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION_iphonesimulator ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR ON)
</span><span class="lines">@@ -173,6 +172,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphonesimulator ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_ICON_LOADING OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATACUE_VALUE ON)
</span><span class="lines">@@ -194,6 +194,7 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: These are turned off temporarily to get CMake working easier.
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=135856
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_macosx OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphoneos OFF)
</span><span class="lines">@@ -215,4 +216,6 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx">
</span><ins>+set(ENABLE_WEBKIT ON)
+set(ENABLE_WEBKIT2 ON)
</ins><span class="cx"> set(WTF_USE_UDIS86 1)
</span></span></pre>
</div>
</div>
</body>
</html>