<!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>[187458] 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/187458">187458</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-07-27 15:39:38 -0700 (Mon, 27 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards building AppleWin with CMake
https://bugs.webkit.org/show_bug.cgi?id=147325
Reviewed by Martin Robinson.
.:
* Source/cmake/OptionsWindows.cmake:
Link with 64-bit libraries if building 64-bit binaries.
Don't run regular expressions on empty strings when using Ninja.
Removed DebugSuffix Visual Studio environment variables.
Source/WebCore:
* PlatformAppleWin.cmake: Added.
* PlatformWin.cmake:
* PlatformWinCairo.cmake:
Moved a lot of common directories from PlatformWinCairo to PlatformWin.
Source/WebKit:
* PlatformWin.cmake:
Removed references to non-existing files.
Source/WebKit/win:
* WebError.cpp:
* WebKitDLL.cpp:
* WebPreferences.cpp:
* WebURLResponse.cpp:
Fix some include quirks.
Source/WTF:
* wtf/PlatformWin.cmake:
Link with CoreFoundation.lib.</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="#trunkSourceWTFwtfPlatformWincmake">trunk/Source/WTF/wtf/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWinCairocmake">trunk/Source/WebCore/PlatformWinCairo.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebErrorcpp">trunk/Source/WebKit/win/WebError.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitDLLcpp">trunk/Source/WebKit/win/WebKitDLL.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebURLResponsecpp">trunk/Source/WebKit/win/WebURLResponse.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsWindowscmake">trunk/Source/cmake/OptionsWindows.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorePlatformAppleWincmake">trunk/Source/WebCore/PlatformAppleWin.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/ChangeLog 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-07-27 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards building AppleWin with CMake
+ https://bugs.webkit.org/show_bug.cgi?id=147325
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/OptionsWindows.cmake:
+ Link with 64-bit libraries if building 64-bit binaries.
+ Don't run regular expressions on empty strings when using Ninja.
+ Removed DebugSuffix Visual Studio environment variables.
+
</ins><span class="cx"> 2015-07-23 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove compile and runtime flags for promises.
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WTF/ChangeLog 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-27 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards building AppleWin with CMake
+ https://bugs.webkit.org/show_bug.cgi?id=147325
+
+ Reviewed by Martin Robinson.
+
+ * wtf/PlatformWin.cmake:
+ Link with CoreFoundation.lib.
+
</ins><span class="cx"> 2015-07-25 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (bmalloc): WebKit performance tests don't report memory stats.
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformWin.cmake (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformWin.cmake 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WTF/wtf/PlatformWin.cmake 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -19,6 +19,10 @@
</span><span class="cx"> list(APPEND WTF_LIBRARIES
</span><span class="cx"> cflite
</span><span class="cx"> )
</span><ins>+else ()
+ list(APPEND WTF_LIBRARIES
+ CoreFoundation
+ )
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> list(APPEND WTF_HEADERS
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WebCore/ChangeLog 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-07-27 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards building AppleWin with CMake
+ https://bugs.webkit.org/show_bug.cgi?id=147325
+
+ Reviewed by Martin Robinson.
+
+ * PlatformAppleWin.cmake: Added.
+ * PlatformWin.cmake:
+ * PlatformWinCairo.cmake:
+ Moved a lot of common directories from PlatformWinCairo to PlatformWin.
+
</ins><span class="cx"> 2015-07-27 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the build after r187383
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformAppleWincmake"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/PlatformAppleWin.cmake (0 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformAppleWin.cmake (rev 0)
+++ trunk/Source/WebCore/PlatformAppleWin.cmake 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "$ENV{WEBKIT_LIBRARIES}/include"
+ "$ENV{WEBKIT_LIBRARIES}/include/zlib"
+ "${WEBCORE_DIR}/loader/archive/cf"
+ "${WEBCORE_DIR}/platform/graphics/ca"
+ "${WEBCORE_DIR}/platform/graphics/ca/win"
+ "${WEBCORE_DIR}/platform/graphics/cg"
+ "${WEBCORE_DIR}/platform/network/cf"
+ "${WEBCORE_DIR}/platform/spi/cf"
+ "${WEBCORE_DIR}/platform/spi/cg"
+)
+
+list(APPEND WebCore_SOURCES
+ editing/SmartReplaceCF.cpp
+
+ platform/cf/URLCF.cpp
+
+ platform/graphics/ca/GraphicsLayerCA.cpp
+ platform/graphics/ca/LayerFlushScheduler.cpp
+ platform/graphics/ca/LayerPool.cpp
+ platform/graphics/ca/PlatformCALayer.cpp
+ platform/graphics/ca/TileController.cpp
+ platform/graphics/ca/TileCoverageMap.cpp
+ platform/graphics/ca/TileGrid.cpp
+ platform/graphics/ca/TransformationMatrixCA.cpp
+
+ platform/graphics/ca/win/CACFLayerTreeHost.cpp
+ platform/graphics/ca/win/LayerChangesFlusher.cpp
+ platform/graphics/ca/win/PlatformCAAnimationWin.cpp
+ platform/graphics/ca/win/PlatformCAFiltersWin.cpp
+ platform/graphics/ca/win/PlatformCALayerWin.cpp
+ platform/graphics/ca/win/PlatformCALayerWinInternal.cpp
+ platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp
+
+ platform/graphics/cg/BitmapImageCG.cpp
+ platform/graphics/cg/ColorCG.cpp
+ platform/graphics/cg/FloatPointCG.cpp
+ platform/graphics/cg/FloatRectCG.cpp
+ platform/graphics/cg/FloatSizeCG.cpp
+ platform/graphics/cg/GradientCG.cpp
+ platform/graphics/cg/GraphicsContext3DCG.cpp
+ platform/graphics/cg/GraphicsContextCG.cpp
+ platform/graphics/cg/IOSurfacePool.cpp
+ platform/graphics/cg/ImageBufferCG.cpp
+ platform/graphics/cg/ImageBufferDataCG.cpp
+ platform/graphics/cg/ImageCG.cpp
+ platform/graphics/cg/ImageSourceCG.cpp
+ platform/graphics/cg/ImageSourceCGWin.cpp
+ platform/graphics/cg/IntPointCG.cpp
+ platform/graphics/cg/IntRectCG.cpp
+ platform/graphics/cg/IntSizeCG.cpp
+ platform/graphics/cg/PDFDocumentImage.cpp
+ platform/graphics/cg/PathCG.cpp
+ platform/graphics/cg/PatternCG.cpp
+ platform/graphics/cg/SubimageCacheWithTimer.cpp
+ platform/graphics/cg/TransformationMatrixCG.cpp
+
+ platform/graphics/win/FontCGWin.cpp
+ platform/graphics/win/FontCustomPlatformData.cpp
+ platform/graphics/win/FontPlatformDataCGWin.cpp
+ platform/graphics/win/GlyphPageTreeNodeCGWin.cpp
+ platform/graphics/win/GraphicsContextCGWin.cpp
+ platform/graphics/win/ImageCGWin.cpp
+ platform/graphics/win/SimpleFontDataCGWin.cpp
+
+ platform/network/cf/AuthenticationCF.cpp
+ platform/network/cf/CookieJarCFNet.cpp
+ platform/network/cf/CookieStorageCFNet.cpp
+ platform/network/cf/CredentialStorageCFNet.cpp
+ platform/network/cf/DNSCFNet.cpp
+ platform/network/cf/FormDataStreamCFNet.cpp
+ platform/network/cf/LoaderRunLoopCF.cpp
+ platform/network/cf/NetworkStorageSessionCFNet.cpp
+ platform/network/cf/ProxyServerCFNet.cpp
+ platform/network/cf/ResourceErrorCF.cpp
+ platform/network/cf/ResourceHandleCFNet.cpp
+ platform/network/cf/ResourceRequestCFNet.cpp
+ platform/network/cf/ResourceResponseCFNet.cpp
+ platform/network/cf/SocketStreamHandleCFNet.cpp
+
+ platform/win/DragImageCGWin.cpp
+)
+
+list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
+ platform/graphics/ca
+ platform/graphics/cg
+
+ platform/graphics/ca/win
+
+ platform/network/cf
+
+ platform/spi/cf
+ platform/spi/cg
+)
</ins></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -1,8 +1,11 @@
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBCORE_DIR}/accessibility/win"
</span><span class="cx"> "${WEBCORE_DIR}/page/win"
</span><ins>+ "${WEBCORE_DIR}/platform/cf"
+ "${WEBCORE_DIR}/platform/cf/win"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/win"
</span><ins>+ "${WEBCORE_DIR}/platform/network/win"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/win"
</span><span class="cx"> "${WEBCORE_DIR}/plugins/win"
</span><span class="cx"> )
</span><span class="lines">@@ -28,11 +31,14 @@
</span><span class="cx"> platform/graphics/opentype/OpenTypeUtilities.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/win/DIBPixelData.cpp
</span><ins>+ platform/graphics/win/FontWin.cpp
+ platform/graphics/win/GraphicsContextWin.cpp
</ins><span class="cx"> platform/graphics/win/IconWin.cpp
</span><span class="cx"> platform/graphics/win/ImageWin.cpp
</span><span class="cx"> platform/graphics/win/IntPointWin.cpp
</span><span class="cx"> platform/graphics/win/IntRectWin.cpp
</span><span class="cx"> platform/graphics/win/IntSizeWin.cpp
</span><ins>+ platform/graphics/win/SimpleFontDataWin.cpp
</ins><span class="cx">
</span><span class="cx"> platform/network/win/NetworkStateNotifierWin.cpp
</span><span class="cx">
</span><span class="lines">@@ -75,16 +81,88 @@
</span><span class="cx"> "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (${WTF_PLATFORM_WIN_CAIRO})
- include(PlatformWinCairo.cmake)
-endif ()
</del><ins>+set(WebCore_FORWARDING_HEADERS_DIRECTORIES
+ accessibility
+ bindings
+ bridge
+ css
+ dom
+ editing
+ history
+ html
+ inspector
+ loader
+ page
+ platform
+ plugins
+ rendering
+ storage
+ svg
+ websockets
+ workers
+ xml
</ins><span class="cx">
</span><del>-set(WebCore_FORWARDING_HEADERS_DIRECTORIES
</del><ins>+ Modules/geolocation
</ins><span class="cx"> Modules/indexeddb
</span><ins>+ Modules/notifications
+ Modules/webdatabase
</ins><span class="cx">
</span><ins>+ accessibility/win
+
+ bindings/generic
+ bindings/js
+
</ins><span class="cx"> bridge/c
</span><ins>+ bridge/jsc
+
+ history/cf
+
+ html/forms
+ html/parser
+
+ loader/appcache
+ loader/archive
+ loader/cache
+ loader/icon
+
+ loader/archive/cf
+
+ page/animation
+ page/win
+
+ platform/animation
+ platform/cf
+ platform/graphics
+ platform/mock
+ platform/network
+ platform/sql
+ platform/text
+ platform/win
+
+ platform/cf/win
+
+ platform/graphics/opentype
+ platform/graphics/transforms
+ platform/graphics/win
+
+ platform/text/transcoder
+
+ rendering/style
+ rendering/svg
+
+ svg/animation
+ svg/graphics
+ svg/properties
+
+ svg/graphics/filters
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+if (${WTF_PLATFORM_WIN_CAIRO})
+ include(PlatformWinCairo.cmake)
+else ()
+ include(PlatformAppleWin.cmake)
+endif ()
+
</ins><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
</span><span class="cx">
</span><span class="cx"> # FIXME: This should test if AVF headers are available.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -10,7 +10,6 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/cairo"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/curl"
</span><del>- "${WEBCORE_DIR}/platform/network/win"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="lines">@@ -184,83 +183,8 @@
</span><span class="cx"> shlwapi
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(WebCore_FORWARDING_HEADERS_DIRECTORIES
- accessibility
- bindings
- bridge
- css
- dom
- editing
- history
- html
- inspector
- loader
- page
- platform
- plugins
- rendering
- storage
- svg
- websockets
- workers
- xml
-
- Modules/geolocation
- Modules/notifications
- Modules/webdatabase
-
- accessibility/win
-
- bindings/generic
- bindings/js
-
- bridge/jsc
-
- history/cf
-
- html/forms
- html/parser
-
- loader/appcache
- loader/archive
- loader/cache
- loader/icon
-
- loader/archive/cf
-
- page/animation
- page/win
-
- platform/animation
- platform/cf
- platform/graphics
- platform/mock
- platform/network
- platform/sql
- platform/text
- platform/win
-
- platform/cf/win
-
</del><ins>+list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
</ins><span class="cx"> platform/graphics/cairo
</span><del>- platform/graphics/opentype
- platform/graphics/transforms
- platform/graphics/win
</del><span class="cx">
</span><del>- platform/graphics/ca/win
-
</del><span class="cx"> platform/network/curl
</span><del>-
- platform/text/transcoder
-
- rendering/style
- rendering/svg
-
- svg/animation
- svg/graphics
- svg/properties
-
- svg/graphics/filters
</del><span class="cx"> )
</span><del>-
-WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
</del></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WebKit/ChangeLog 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-27 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards building AppleWin with CMake
+ https://bugs.webkit.org/show_bug.cgi?id=147325
+
+ Reviewed by Martin Robinson.
+
+ * PlatformWin.cmake:
+ Removed references to non-existing files.
+
</ins><span class="cx"> 2015-07-22 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix quirks in CMake build on Mac and Windows
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -275,7 +275,6 @@
</span><span class="cx"> win/Interfaces/IWebBackForwardList.idl
</span><span class="cx"> win/Interfaces/IWebBackForwardListPrivate.idl
</span><span class="cx"> win/Interfaces/IWebCache.idl
</span><del>- win/Interfaces/IWebCookieManager.idl
</del><span class="cx"> win/Interfaces/IWebCoreStatistics.idl
</span><span class="cx"> win/Interfaces/IWebDataSource.idl
</span><span class="cx"> win/Interfaces/IWebDatabaseManager.idl
</span><span class="lines">@@ -311,7 +310,6 @@
</span><span class="cx"> win/Interfaces/IWebMutableURLRequest.idl
</span><span class="cx"> win/Interfaces/IWebMutableURLRequestPrivate.idl
</span><span class="cx"> win/Interfaces/IWebNavigationData.idl
</span><del>- win/Interfaces/IWebNetworkConfiguration.idl
</del><span class="cx"> win/Interfaces/IWebNotification.idl
</span><span class="cx"> win/Interfaces/IWebNotificationCenter.idl
</span><span class="cx"> win/Interfaces/IWebNotificationObserver.idl
</span><span class="lines">@@ -325,8 +323,6 @@
</span><span class="cx"> win/Interfaces/IWebResourceLoadDelegatePrivate2.idl
</span><span class="cx"> win/Interfaces/IWebScriptObject.idl
</span><span class="cx"> win/Interfaces/IWebScriptWorld.idl
</span><del>- win/Interfaces/IWebScrollBarDelegatePrivate.idl
- win/Interfaces/IWebScrollBarPrivate.idl
</del><span class="cx"> win/Interfaces/IWebSecurityOrigin.idl
</span><span class="cx"> win/Interfaces/IWebSerializedJSValue.idl
</span><span class="cx"> win/Interfaces/IWebSerializedJSValuePrivate.idl
</span><span class="lines">@@ -413,6 +409,7 @@
</span><span class="cx"> # If this directory isn't created before midl runs and attempts to output WebKit.tlb,
</span><span class="cx"> # It fails with an unusual error - midl failed - failed to save all changes
</span><span class="cx"> file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
</span><ins>+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces)
</ins><span class="cx">
</span><span class="cx"> set(WebKit_FORWARDING_HEADERS
</span><span class="cx"> "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h"
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WebKit/win/ChangeLog 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-07-27 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards building AppleWin with CMake
+ https://bugs.webkit.org/show_bug.cgi?id=147325
+
+ Reviewed by Martin Robinson.
+
+ * WebError.cpp:
+ * WebKitDLL.cpp:
+ * WebPreferences.cpp:
+ * WebURLResponse.cpp:
+ Fix some include quirks.
+
</ins><span class="cx"> 2015-07-27 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Curl] Crash in CurlDownload::didReceiveHeader when downloading file.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebError.cpp (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebError.cpp 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WebKit/win/WebError.cpp 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -29,6 +29,10 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/BString.h>
</span><span class="cx">
</span><ins>+#if USE(CG)
+#include <CoreGraphics/CoreGraphics.h>
+#endif
+
</ins><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> #include <WebKitSystemInterface/WebKitSystemInterface.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitDLLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitDLL.cpp (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitDLL.cpp 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WebKit/win/WebKitDLL.cpp 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -25,6 +25,10 @@
</span><span class="cx">
</span><span class="cx"> #include "WebKitDLL.h"
</span><span class="cx">
</span><ins>+#if USE(CG)
+#include <CoreGraphics/CoreGraphics.h>
+#endif
+
</ins><span class="cx"> #include "ForEachCoClass.h"
</span><span class="cx"> #include "resource.h"
</span><span class="cx"> #include "WebKit.h"
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.cpp 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -30,6 +30,12 @@
</span><span class="cx"> #include "WebNotificationCenter.h"
</span><span class="cx"> #include "WebPreferenceKeysPrivate.h"
</span><span class="cx">
</span><ins>+#if USE(CG)
+#include <CoreGraphics/CoreGraphics.h>
+#include <WebCore/CACFLayerTreeHost.h>
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
+
</ins><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="lines">@@ -45,12 +51,6 @@
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if USE(CG)
-#include <CoreGraphics/CoreGraphics.h>
-#include <WebCore/CACFLayerTreeHost.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx"> using std::numeric_limits;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebURLResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebURLResponse.cpp (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebURLResponse.cpp 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/WebKit/win/WebURLResponse.cpp 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -31,6 +31,10 @@
</span><span class="cx"> #include "COMPropertyBag.h"
</span><span class="cx"> #include "MarshallingHelpers.h"
</span><span class="cx">
</span><ins>+#if USE(CG)
+#include <CoreGraphics/CoreGraphics.h>
+#endif
+
</ins><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> #include <WebKitSystemInterface/WebKitSystemInterface.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWindowscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWindows.cmake (187457 => 187458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWindows.cmake 2015-07-27 22:30:41 UTC (rev 187457)
+++ trunk/Source/cmake/OptionsWindows.cmake 2015-07-27 22:39:38 UTC (rev 187458)
</span><span class="lines">@@ -12,7 +12,12 @@
</span><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx">
</span><span class="cx"> include_directories("$ENV{WEBKIT_LIBRARIES}/include")
</span><del>-link_directories("$ENV{WEBKIT_LIBRARIES}/lib$(PlatformArchitecture)")
</del><ins>+if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
+ link_directories("$ENV{WEBKIT_LIBRARIES}/lib32")
+else ()
+ link_directories("$ENV{WEBKIT_LIBRARIES}/lib64")
+endif ()
+
</ins><span class="cx"> if (MSVC)
</span><span class="cx"> add_definitions(
</span><span class="cx"> /wd4018 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4146 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4267 /wd4275 /wd4288
</span><span class="lines">@@ -20,11 +25,13 @@
</span><span class="cx"> /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387
</span><span class="cx"> /MP
</span><span class="cx"> )
</span><del>- string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
- string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
</del><ins>+ if (NOT ${CMAKE_CXX_FLAGS} STREQUAL "")
+ string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
+ string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
+ endif ()
</ins><span class="cx"> endif ()
</span><span class="cx">
</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$(DebugSuffix) libicuin$(DebugSuffix))
</del><ins>+set(ICU_LIBRARIES libicuuc libicuin)
</ins></span></pre>
</div>
</div>
</body>
</html>