<!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>[195183] 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/195183">195183</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2016-01-17 10:09:19 -0800 (Sun, 17 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] Do not build bmalloc when USE_SYSTEM_MALLOC is ON
https://bugs.webkit.org/show_bug.cgi?id=153190
Reviewed by Csaba Osztrogonác.
Build bmalloc when NOT USE_SYSTEM_MALLOC rather than when NOT WIN32.
.:
* Source/CMakeLists.txt:
* Source/cmake/OptionsWin.cmake:
Source/WTF:
* wtf/CMakeLists.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceCMakeListstxt">trunk/Source/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#trunkSourcecmakeOptionsWincmake">trunk/Source/cmake/OptionsWin.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (195182 => 195183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-01-17 09:15:45 UTC (rev 195182)
+++ trunk/ChangeLog 2016-01-17 18:09:19 UTC (rev 195183)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-17 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] Do not build bmalloc when USE_SYSTEM_MALLOC is ON
+ https://bugs.webkit.org/show_bug.cgi?id=153190
+
+ Reviewed by Csaba Osztrogonác.
+
+ Build bmalloc when NOT USE_SYSTEM_MALLOC rather than when NOT WIN32.
+
+ * Source/CMakeLists.txt:
+ * Source/cmake/OptionsWin.cmake:
+
</ins><span class="cx"> 2016-01-16 Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use -Wl,-all_load on darwin to include contents of all static archives
</span></span></pre></div>
<a id="trunkSourceCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/CMakeLists.txt (195182 => 195183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/CMakeLists.txt 2016-01-17 09:15:45 UTC (rev 195182)
+++ trunk/Source/CMakeLists.txt 2016-01-17 18:09:19 UTC (rev 195183)
</span><span class="lines">@@ -1,8 +1,7 @@
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> # Add module directories
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-# FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310
-if (NOT WIN32)
</del><ins>+if (NOT USE_SYSTEM_MALLOC)
</ins><span class="cx"> add_subdirectory(bmalloc)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="lines">@@ -33,8 +32,7 @@
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> # Set compiler flags for all targets
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-# FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310
-if (NOT WIN32)
</del><ins>+if (NOT USE_SYSTEM_MALLOC)
</ins><span class="cx"> WEBKIT_SET_EXTRA_COMPILER_FLAGS(bmalloc ${ADDITIONAL_COMPILER_FLAGS})
</span><span class="cx"> endif ()
</span><span class="cx"> WEBKIT_SET_EXTRA_COMPILER_FLAGS(WTF ${ADDITIONAL_COMPILER_FLAGS})
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (195182 => 195183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-01-17 09:15:45 UTC (rev 195182)
+++ trunk/Source/WTF/ChangeLog 2016-01-17 18:09:19 UTC (rev 195183)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-17 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] Do not build bmalloc when USE_SYSTEM_MALLOC is ON
+ https://bugs.webkit.org/show_bug.cgi?id=153190
+
+ Reviewed by Csaba Osztrogonác.
+
+ Build bmalloc when NOT USE_SYSTEM_MALLOC rather than when NOT WIN32.
+
+ * wtf/CMakeLists.txt:
+
</ins><span class="cx"> 2016-01-15 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add kdebug_trace signposts for a few WebCore operations
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (195182 => 195183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2016-01-17 09:15:45 UTC (rev 195182)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2016-01-17 18:09:19 UTC (rev 195183)
</span><span class="lines">@@ -249,8 +249,7 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-# FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310
-if (NOT WIN32)
</del><ins>+if (NOT USE_SYSTEM_MALLOC)
</ins><span class="cx"> list(APPEND WTF_LIBRARIES bmalloc)
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWin.cmake (195182 => 195183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWin.cmake 2016-01-17 09:15:45 UTC (rev 195182)
+++ trunk/Source/cmake/OptionsWin.cmake 2016-01-17 18:09:19 UTC (rev 195183)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBVTT_REGIONS PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
</span><span class="cx">
</span><ins>+# FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PRIVATE ON)
</span><span class="cx">
</span><span class="cx"> if (${WTF_PLATFORM_WIN_CAIRO})
</span></span></pre>
</div>
</div>
</body>
</html>