<!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>[204581] 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/204581">204581</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-17 16:29:50 -0700 (Wed, 17 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use find_library within Windows build
https://bugs.webkit.org/show_bug.cgi?id=160904
Patch by Don Olmstead <don.olmstead@am.sony.com> on 2016-08-17
Reviewed by Brent Fulgham.
.:
* Source/cmake/FindICU.cmake:
* 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="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#trunkSourcecmakeFindICUcmake">trunk/Source/cmake/FindICU.cmake</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 (204580 => 204581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-08-17 23:08:26 UTC (rev 204580)
+++ trunk/ChangeLog 2016-08-17 23:29:50 UTC (rev 204581)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-17 Don Olmstead <don.olmstead@am.sony.com>
+
+ Use find_library within Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=160904
+
+ Reviewed by Brent Fulgham.
+
+ * Source/cmake/FindICU.cmake:
+ * Source/cmake/OptionsWin.cmake:
+
</ins><span class="cx"> 2016-08-17 Gyuyoung Kim <gyuyoung.kim@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Bump efl version from 1.17 to 1.18
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (204580 => 204581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-08-17 23:08:26 UTC (rev 204580)
+++ trunk/Source/WTF/ChangeLog 2016-08-17 23:29:50 UTC (rev 204581)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-17 Don Olmstead <don.olmstead@am.sony.com>
+
+ Use find_library within Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=160904
+
+ Reviewed by Brent Fulgham.
+
+ * wtf/CMakeLists.txt:
+
</ins><span class="cx"> 2016-08-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move WKSignedPublicKeyAndChallengeString into WebCore and make it proper C++
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (204580 => 204581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2016-08-17 23:08:26 UTC (rev 204580)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2016-08-17 23:29:50 UTC (rev 204581)
</span><span class="lines">@@ -279,6 +279,7 @@
</span><span class="cx"> ${ICU_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx"> list(APPEND WTF_LIBRARIES
</span><ins>+ ${ICU_DATA_LIBRARIES}
</ins><span class="cx"> ${ICU_I18N_LIBRARIES}
</span><span class="cx"> ${ICU_LIBRARIES}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourcecmakeFindICUcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindICU.cmake (204580 => 204581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindICU.cmake 2016-08-17 23:08:26 UTC (rev 204580)
+++ trunk/Source/cmake/FindICU.cmake 2016-08-17 23:29:50 UTC (rev 204581)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> NAMES unicode/utypes.h
</span><span class="cx"> HINTS ${PC_ICU_INCLUDE_DIRS}
</span><span class="cx"> ${PC_ICU_INCLUDEDIR}
</span><ins>+ ${WEBKIT_LIBRARIES_INCLUDE_DIR}
</ins><span class="cx"> DOC "Include directory for the ICU library")
</span><span class="cx"> mark_as_advanced(ICU_INCLUDE_DIR)
</span><span class="cx">
</span><span class="lines">@@ -24,9 +25,10 @@
</span><span class="cx"> # Look for the library.
</span><span class="cx"> find_library(
</span><span class="cx"> ICU_LIBRARY
</span><del>- NAMES icuuc cygicuuc cygicuuc32
</del><ins>+ NAMES icuuc libicuuc cygicuuc cygicuuc32
</ins><span class="cx"> HINTS ${PC_ICU_LIBRARY_DIRS}
</span><span class="cx"> ${PC_ICU_LIBDIR}
</span><ins>+ ${WEBKIT_LIBRARIES_LINK_DIR}
</ins><span class="cx"> DOC "Libraries to link against for the common parts of ICU")
</span><span class="cx"> mark_as_advanced(ICU_LIBRARY)
</span><span class="cx">
</span><span class="lines">@@ -49,9 +51,10 @@
</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 cygicuin cygicuin32
</del><ins>+ NAMES icui18n icuin libicui18n libicuin cygicuin cygicuin32
</ins><span class="cx"> HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
</span><span class="cx"> ${PC_ICU_I18N_LIBDIR}
</span><ins>+ ${WEBKIT_LIBRARIES_LINK_DIR}
</ins><span class="cx"> DOC "Libraries to link against for ICU internationalization")
</span><span class="cx"> mark_as_advanced(ICU_I18N_LIBRARY)
</span><span class="cx"> if (ICU_I18N_LIBRARY)
</span><span class="lines">@@ -61,11 +64,30 @@
</span><span class="cx"> set(ICU_I18N_FOUND 0)
</span><span class="cx"> set(ICU_I18N_LIBRARIES)
</span><span class="cx"> endif ()
</span><ins>+
+ # Look for the ICU data libraries
+ find_library(
+ ICU_DATA_LIBRARY
+ NAMES icudata libicudata cygicudata cygicudata32
+ HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
+ ${PC_ICU_I18N_LIBDIR}
+ ${WEBKIT_LIBRARIES_LINK_DIR}
+ DOC "Libraries to link against for ICU data")
+ mark_as_advanced(ICU_DATA_LIBRARY)
+ if (ICU_DATA_LIBRARY)
+ set(ICU_DATA_FOUND 1)
+ set(ICU_DATA_LIBRARIES ${ICU_DATA_LIBRARY})
+ else ()
+ set(ICU_DATA_FOUND 0)
+ set(ICU_DATA_LIBRARIES)
+ endif ()
</ins><span class="cx"> else ()
</span><span class="cx"> set(ICU_FOUND 0)
</span><span class="cx"> set(ICU_I18N_FOUND 0)
</span><ins>+ set(ICU_DATA_FOUND 0)
</ins><span class="cx"> set(ICU_LIBRARIES)
</span><span class="cx"> set(ICU_I18N_LIBRARIES)
</span><ins>+ set(ICU_DATA_LIBRARIES)
</ins><span class="cx"> set(ICU_INCLUDE_DIRS)
</span><span class="cx"> set(ICU_VERSION)
</span><span class="cx"> set(ICU_MAJOR_VERSION)
</span><span class="lines">@@ -76,6 +98,8 @@
</span><span class="cx"> if (NOT ICU_FIND_QUIETLY)
</span><span class="cx"> message(STATUS "Found ICU header files in ${ICU_INCLUDE_DIRS}")
</span><span class="cx"> message(STATUS "Found ICU libraries: ${ICU_LIBRARIES}")
</span><ins>+ message(STATUS "Found ICU internationaliation libraries: ${ICU_I18N_LIBRARIES}")
+ message(STATUS "Found ICU data libraries: ${ICU_DATA_LIBRARIES}")
</ins><span class="cx"> endif ()
</span><span class="cx"> else ()
</span><span class="cx"> if (ICU_FIND_REQUIRED)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWin.cmake (204580 => 204581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWin.cmake 2016-08-17 23:08:26 UTC (rev 204580)
+++ trunk/Source/cmake/OptionsWin.cmake 2016-08-17 23:29:50 UTC (rev 204581)
</span><span class="lines">@@ -93,18 +93,25 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-include_directories("${CMAKE_BINARY_DIR}/DerivedSources/ForwardingHeaders" "${CMAKE_BINARY_DIR}/DerivedSources" "${WEBKIT_LIBRARIES_DIR}/include")
</del><ins>+set(WEBKIT_LIBRARIES_INCLUDE_DIR "${WEBKIT_LIBRARIES_DIR}/include")
+
+include_directories("${CMAKE_BINARY_DIR}/DerivedSources/ForwardingHeaders" "${CMAKE_BINARY_DIR}/DerivedSources" "${WEBKIT_LIBRARIES_INCLUDE_DIR}")
</ins><span class="cx"> if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
</span><del>- link_directories("${CMAKE_BINARY_DIR}/lib32" "${WEBKIT_LIBRARIES_DIR}/lib32")
</del><ins>+ set(WEBKIT_LIBRARIES_LINK_DIR "${WEBKIT_LIBRARIES_DIR}/lib32")
+ # FIXME: Remove ${WEBKIT_LIBRARIES_LINK_DIR} when find_library is used for everything
+ link_directories("${CMAKE_BINARY_DIR}/lib32" "${WEBKIT_LIBRARIES_LINK_DIR}")
</ins><span class="cx"> set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib32)
</span><span class="cx"> set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib32)
</span><span class="cx"> set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin32)
</span><span class="cx"> else ()
</span><del>- link_directories("${CMAKE_BINARY_DIR}/lib64" "${WEBKIT_LIBRARIES_DIR}/lib64")
</del><ins>+ set(WEBKIT_LIBRARIES_LINK_DIR "${WEBKIT_LIBRARIES_DIR}/lib64")
+ # FIXME: Remove ${WEBKIT_LIBRARIES_LINK_DIR} when find_library is used for everything
+ link_directories("${CMAKE_BINARY_DIR}/lib64" "${WEBKIT_LIBRARIES_LINK_DIR}")
</ins><span class="cx"> set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64)
</span><span class="cx"> set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64)
</span><span class="cx"> set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin64)
</span><span class="cx"> endif ()
</span><ins>+
</ins><span class="cx"> set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
</span><span class="cx"> set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
</span><span class="cx"> set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span class="lines">@@ -181,4 +188,5 @@
</span><span class="cx"> set(PORT Win)
</span><span class="cx"> set(JavaScriptCore_LIBRARY_TYPE SHARED)
</span><span class="cx"> set(WTF_LIBRARY_TYPE SHARED)
</span><del>-set(ICU_LIBRARIES libicuuc${DEBUG_SUFFIX} libicuin${DEBUG_SUFFIX})
</del><ins>+
+find_package(ICU REQUIRED)
</ins></span></pre>
</div>
</div>
</body>
</html>