<!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>[209138] 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/209138">209138</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-11-30 10:45:57 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Apple build is using incorrect ICU library (if present)
https://bugs.webkit.org/show_bug.cgi?id=164934
<rdar://problem/29329654>
Reviewed by Alex Christensen.
Move the 'icuuc.lib' and 'icuin.lib' library names to the end of the set of choices when searching for ICU.
so that we preferentially select the 'new' version of these libraries if they are available.
* Source/cmake/FindICU.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeFindICUcmake">trunk/Source/cmake/FindICU.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (209137 => 209138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-11-30 18:42:14 UTC (rev 209137)
+++ trunk/ChangeLog 2016-11-30 18:45:57 UTC (rev 209138)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-30 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Apple build is using incorrect ICU library (if present)
+ https://bugs.webkit.org/show_bug.cgi?id=164934
+ <rdar://problem/29329654>
+
+ Reviewed by Alex Christensen.
+
+ Move the 'icuuc.lib' and 'icuin.lib' library names to the end of the set of choices when searching for ICU.
+ so that we preferentially select the 'new' version of these libraries if they are available.
+
+ * Source/cmake/FindICU.cmake:
+
</ins><span class="cx"> 2016-11-23 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE_ASSEMBLER_WX_EXCLUSIVE code
</span></span></pre></div>
<a id="trunkSourcecmakeFindICUcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindICU.cmake (209137 => 209138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindICU.cmake 2016-11-30 18:42:14 UTC (rev 209137)
+++ trunk/Source/cmake/FindICU.cmake 2016-11-30 18:45:57 UTC (rev 209138)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> # Look for the library.
</span><span class="cx"> find_library(
</span><span class="cx"> ICU_LIBRARY
</span><del>- NAMES icuuc libicuuc cygicuuc cygicuuc32
</del><ins>+ NAMES libicuuc cygicuuc cygicuuc32 icuuc
</ins><span class="cx"> HINTS ${PC_ICU_LIBRARY_DIRS}
</span><span class="cx"> ${PC_ICU_LIBDIR}
</span><span class="cx"> ${WEBKIT_LIBRARIES_LINK_DIR}
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> pkg_check_modules(PC_ICU_I18N icu-i18n)
</span><span class="cx"> find_library(
</span><span class="cx"> ICU_I18N_LIBRARY
</span><del>- NAMES icui18n icuin libicui18n libicuin cygicuin cygicuin32
</del><ins>+ NAMES icui18n libicui18n libicuin cygicuin cygicuin32 icuin
</ins><span class="cx"> HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
</span><span class="cx"> ${PC_ICU_I18N_LIBDIR}
</span><span class="cx"> ${WEBKIT_LIBRARIES_LINK_DIR}
</span></span></pre>
</div>
</div>
</body>
</html>