<!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>[182545] 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/182545">182545</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-08 09:47:56 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add CMake build system for WinCairo port.
https://bugs.webkit.org/show_bug.cgi?id=115944
Patch by Alex Christensen <achristensen@webkit.org> and Patrick Gansterer <paroga@webkit.org> on 2015-04-08
Reviewed by Chris Dumez.
.:
* Source/cmake/OptionsWindows.cmake:
* Source/cmake/WebKitMacros.cmake:
Make ADD_PRECOMPILED_HEADER more like http://stackoverflow.com/questions/148570/using-pre-compiled-headers-with-cmake
Source/WebCore:
* CMakeLists.txt:
* PlatformWin.cmake:
* PlatformWinCairo.cmake:
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGL::TextureMapperGL):
Source/WebKit:
* CMakeLists.txt:
Source/WTF:
* wtf/FeatureDefines.h:
* wtf/PlatformWin.cmake:
Tools:
* CMakeLists.txt:
* WinLauncher/CMakeLists.txt: Added.</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="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformWincmake">trunk/Source/WTF/wtf/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</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="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp</a></li>
<li><a href="#trunkSourceWebKitCMakeListstxt">trunk/Source/WebKit/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeOptionsWindowscmake">trunk/Source/cmake/OptionsWindows.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
<li><a href="#trunkToolsCMakeListstxt">trunk/Tools/CMakeLists.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsWinLauncherCMakeListstxt">trunk/Tools/WinLauncher/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/ChangeLog 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-08 Alex Christensen <achristensen@webkit.org> and Patrick Gansterer <paroga@webkit.org>
+
+ Add CMake build system for WinCairo port.
+ https://bugs.webkit.org/show_bug.cgi?id=115944
+
+ Reviewed by Chris Dumez.
+
+ * Source/cmake/OptionsWindows.cmake:
+ * Source/cmake/WebKitMacros.cmake:
+ Make ADD_PRECOMPILED_HEADER more like http://stackoverflow.com/questions/148570/using-pre-compiled-headers-with-cmake
+
</ins><span class="cx"> 2015-04-06 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix HPPA build
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/WTF/ChangeLog 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-08 Alex Christensen <achristensen@webkit.org> and Patrick Gansterer <paroga@webkit.org>
+
+ Add CMake build system for WinCairo port.
+ https://bugs.webkit.org/show_bug.cgi?id=115944
+
+ Reviewed by Chris Dumez.
+
+ * wtf/FeatureDefines.h:
+ * wtf/PlatformWin.cmake:
+
</ins><span class="cx"> 2015-04-05 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Bloom filter should support longer hashes
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -268,6 +268,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !defined(ENABLE_GEOLOCATION)
+#define ENABLE_GEOLOCATION 1
+#endif
+
</ins><span class="cx"> #endif /* PLATFORM(WIN) && !PLATFORM(WIN_CAIRO) */
</span><span class="cx">
</span><span class="cx"> /* --------- Windows CAIRO port --------- */
</span><span class="lines">@@ -292,6 +296,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !defined(ENABLE_GEOLOCATION)
+#define ENABLE_GEOLOCATION 1
+#endif
+
</ins><span class="cx"> #endif /* PLATFORM(WIN_CAIRO) */
</span><span class="cx">
</span><span class="cx"> /* --------- EFL port (Unix) --------- */
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformWin.cmake (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformWin.cmake 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/WTF/wtf/PlatformWin.cmake 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -1,14 +1,28 @@
</span><span class="cx"> list(APPEND WTF_SOURCES
</span><ins>+ text/cf/AtomicStringCF.cpp
+ text/cf/StringCF.cpp
+ text/cf/StringImplCF.cpp
+ text/cf/StringViewCF.cpp
+
</ins><span class="cx"> threads/win/BinarySemaphoreWin.cpp
</span><span class="cx">
</span><span class="cx"> win/MainThreadWin.cpp
</span><span class="cx"> win/RunLoopWin.cpp
</span><ins>+ win/WTFDLL.cpp
+ win/WorkItemWin.cpp
+ win/WorkQueueWin.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WTF_LIBRARIES
</span><span class="cx"> winmm
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+if (${WTF_PLATFORM_WIN_CAIRO})
+ list(APPEND WTF_LIBRARIES
+ cflite
+ )
+endif ()
+
</ins><span class="cx"> list(APPEND WTF_HEADERS
</span><span class="cx"> "${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -3507,6 +3507,10 @@
</span><span class="cx">
</span><span class="cx"> include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
</span><span class="cx">
</span><ins>+if (MSVC)
+ ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
+endif ()
+
</ins><span class="cx"> add_library(WebCore ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
</span><span class="cx"> set_target_properties(WebCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebCore")
</span><span class="cx"> set_target_properties(WebCore PROPERTIES FOLDER "WebCore")
</span><span class="lines">@@ -3515,6 +3519,10 @@
</span><span class="cx"> set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (MSVC)
+ ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
+endif ()
+
</ins><span class="cx"> add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
</span><span class="cx"> target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
</span><span class="cx"> set_target_properties(WebCoreTestSupport PROPERTIES FOLDER "WebCore")
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/WebCore/ChangeLog 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-08 Alex Christensen <achristensen@webkit.org> and Patrick Gansterer <paroga@webkit.org>
+
+ Add CMake build system for WinCairo port.
+ https://bugs.webkit.org/show_bug.cgi?id=115944
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+ * PlatformWinCairo.cmake:
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGL::TextureMapperGL):
+
</ins><span class="cx"> 2015-04-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename ActiveDOMObject::canSuspend() to canSuspendForPageCache() for clarity
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -66,8 +66,6 @@
</span><span class="cx"> platform/win/WidgetWin.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><del>-ADD_PRECOMPILED_HEADER("WebCorePrefix" WebCore_SOURCES)
-
</del><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
</span><span class="cx"> )
</span><span class="lines">@@ -76,6 +74,14 @@
</span><span class="cx"> include(PlatformWinCairo.cmake)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+set(WebCore_FORWARDING_HEADERS_DIRECTORIES
+ bridge/c
+
+ Modules/indexeddb
+)
+
+WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
+
</ins><span class="cx"> # FIXME: This should test if AVF headers are available.
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=135861
</span><span class="cx"> add_custom_command(
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> platform/cf/CFURLExtras.cpp
</span><span class="cx"> platform/cf/FileSystemCF.cpp
</span><span class="cx"> platform/cf/SharedBufferCF.cpp
</span><ins>+ platform/cf/URLCF.cpp
</ins><span class="cx">
</span><span class="cx"> platform/cf/win/CertificateCFWin.cpp
</span><span class="cx">
</span><span class="lines">@@ -57,6 +58,23 @@
</span><span class="cx"> platform/graphics/cairo/RefPtrCairo.cpp
</span><span class="cx"> platform/graphics/cairo/TransformationMatrixCairo.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/texmap/BitmapTexture.cpp
+ platform/graphics/texmap/BitmapTextureGL.cpp
+ platform/graphics/texmap/BitmapTextureImageBuffer.cpp
+ platform/graphics/texmap/BitmapTexturePool.cpp
+ platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
+ platform/graphics/texmap/TextureMapper.cpp
+ platform/graphics/texmap/TextureMapperAnimation.cpp
+ platform/graphics/texmap/TextureMapperBackingStore.cpp
+ platform/graphics/texmap/TextureMapperFPSCounter.cpp
+ platform/graphics/texmap/TextureMapperGL.cpp
+ platform/graphics/texmap/TextureMapperImageBuffer.cpp
+ platform/graphics/texmap/TextureMapperLayer.cpp
+ platform/graphics/texmap/TextureMapperShaderProgram.cpp
+ platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp
+ platform/graphics/texmap/TextureMapperTile.cpp
+ platform/graphics/texmap/TextureMapperTiledBackingStore.cpp
+
</ins><span class="cx"> platform/graphics/win/DIBPixelData.cpp
</span><span class="cx"> platform/graphics/win/FontCacheWin.cpp
</span><span class="cx"> platform/graphics/win/FontCustomPlatformDataCairo.cpp
</span><span class="lines">@@ -73,14 +91,32 @@
</span><span class="cx"> platform/graphics/win/TransformationMatrixWin.cpp
</span><span class="cx"> platform/graphics/win/UniscribeController.cpp
</span><span class="cx">
</span><ins>+ platform/image-decoders/ImageDecoder.cpp
+
+ platform/image-decoders/bmp/BMPImageDecoder.cpp
+ platform/image-decoders/bmp/BMPImageReader.cpp
+
</ins><span class="cx"> platform/image-decoders/cairo/ImageDecoderCairo.cpp
</span><span class="cx">
</span><ins>+ platform/image-decoders/gif/GIFImageDecoder.cpp
+ platform/image-decoders/gif/GIFImageReader.cpp
+
+ platform/image-decoders/ico/ICOImageDecoder.cpp
+
+ platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+
+ platform/image-decoders/png/PNGImageDecoder.cpp
+
+ platform/image-decoders/webp/WEBPImageDecoder.cpp
+
</ins><span class="cx"> platform/network/CredentialStorage.cpp
</span><span class="cx"> platform/network/NetworkStorageSessionStub.cpp
</span><span class="cx"> platform/network/SynchronousLoaderClient.cpp
</span><span class="cx">
</span><span class="cx"> platform/network/curl/CookieJarCurl.cpp
</span><span class="cx"> platform/network/curl/CredentialStorageCurl.cpp
</span><ins>+ platform/network/curl/CurlCacheEntry.cpp
+ platform/network/curl/CurlCacheManager.cpp
</ins><span class="cx"> platform/network/curl/CurlDownload.cpp
</span><span class="cx"> platform/network/curl/DNSCurl.cpp
</span><span class="cx"> platform/network/curl/FormDataStreamCurl.cpp
</span><span class="lines">@@ -89,6 +125,7 @@
</span><span class="cx"> platform/network/curl/ResourceHandleCurl.cpp
</span><span class="cx"> platform/network/curl/ResourceHandleManager.cpp
</span><span class="cx"> platform/network/curl/SocketStreamHandleCurl.cpp
</span><ins>+ platform/network/curl/SSLHandle.cpp
</ins><span class="cx">
</span><span class="cx"> platform/network/win/DownloadBundleWin.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -246,7 +246,9 @@
</span><span class="cx"> {
</span><span class="cx"> m_context3D = GraphicsContext3D::createForCurrentGLContext();
</span><span class="cx"> m_data = new TextureMapperGLData(m_context3D.get());
</span><ins>+#if USE(TEXTURE_MAPPER_GL)
</ins><span class="cx"> m_texturePool = std::make_unique<BitmapTexturePool>(m_context3D);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextureMapperGL::ClipStack& TextureMapperGL::clipStack()
</span></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit_INCLUDE_DIRECTORIES
</span><ins>+ "${CMAKE_BINARY_DIR}"
+ "${CMAKE_SOURCE_DIR}/Source"
</ins><span class="cx"> "${DERIVED_SOURCES_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
</span><span class="lines">@@ -9,7 +11,6 @@
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/disassembler"
</span><del>- "${CMAKE_SOURCE_DIR}/Source"
</del><span class="cx"> "${WTF_DIR}"
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -22,11 +23,15 @@
</span><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span><span class="cx">
</span><span class="cx"> include_directories(${WebKit_INCLUDE_DIRECTORIES})
</span><ins>+
+if (MSVC)
+ ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES)
+endif ()
+
</ins><span class="cx"> add_library(WebKit ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
</span><span class="cx"> add_dependencies(WebKit WebCore)
</span><span class="cx"> target_link_libraries(WebKit ${WebKit_LIBRARIES})
</span><span class="cx"> set_target_properties(WebKit PROPERTIES FOLDER "WebKit")
</span><del>-set_target_properties(WebKit PROPERTIES LINK_INTERFACE_LIBRARIES "")
</del><span class="cx">
</span><span class="cx"> if (WebKit_OUTPUT_NAME)
</span><span class="cx"> set_target_properties(WebKit PROPERTIES OUTPUT_NAME ${WebKit_OUTPUT_NAME})
</span><span class="lines">@@ -34,4 +39,4 @@
</span><span class="cx">
</span><span class="cx"> POPULATE_LIBRARY_VERSION(WEBKIT)
</span><span class="cx"> set_target_properties(WebKit PROPERTIES VERSION ${WEBKIT_VERSION} SOVERSION ${WEBKIT_VERSION_MAJOR})
</span><del>-install(TARGETS WebKit DESTINATION "${LIB_INSTALL_DIR}")
</del><span class="cx">\ No newline at end of file
</span><ins>+install(TARGETS WebKit DESTINATION "${LIB_INSTALL_DIR}")
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/WebKit/ChangeLog 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-04-08 Alex Christensen <achristensen@webkit.org> and Patrick Gansterer <paroga@webkit.org>
+
+ Add CMake build system for WinCairo port.
+ https://bugs.webkit.org/show_bug.cgi?id=115944
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+
</ins><span class="cx"> 2015-04-07 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of uses of ApplicationCacheStorage::singleton() from WebKitLegacy
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWindowscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWindows.cmake (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWindows.cmake 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/cmake/OptionsWindows.cmake 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -3,9 +3,11 @@
</span><span class="cx"> #FIXME: Make sure these are the same as the Windows feature defines once we get CMake working on Windows.
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_VENDOR_PREFIXES OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PICTURE_SIZES ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PROMISES OFF)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_STREAM_API OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC ON)
</span><span class="cx"> WEBKIT_OPTION_END()
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Source/cmake/WebKitMacros.cmake 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -23,19 +23,21 @@
</span><span class="cx"> set_source_files_properties(${_source} PROPERTIES OBJECT_DEPENDS "${_tmp}")
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><del>-macro(ADD_PRECOMPILED_HEADER _name _output_source)
</del><ins>+macro(ADD_PRECOMPILED_HEADER _header _cpp _source)
</ins><span class="cx"> if (MSVC)
</span><del>- set_source_files_properties(${_name}.cpp
- PROPERTIES COMPILE_FLAGS "/Yc\"${_name}.h\" /Fp\"${_name}.pch\""
- OBJECT_OUTPUTS "${_name}.pch")
- foreach (_file ${_input_files})
- set_source_files_properties(${_file}
- PROPERTIES COMPILE_FLAGS "/Yu\"${_name}.h\" /FI\"${_name}.h\" /Fp\"${_name}.pch\""
- OBJECT_DEPENDS "${PrecompiledBinary}")
- endforeach ()
</del><ins>+ get_filename_component(PrecompiledBasename ${_header} NAME_WE)
+ set(PrecompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${PrecompiledBasename}.pch")
+ set(_sources ${${_source}})
+
+ set_source_files_properties(${_cpp}
+ PROPERTIES COMPILE_FLAGS "/Yc\"${_header}\" /Fp\"${PrecompiledBinary}\""
+ OBJECT_OUTPUTS "${PrecompiledBinary}")
+ set_source_files_properties(${_sources}
+ PROPERTIES COMPILE_FLAGS "/Yu\"${_header}\" /FI\"${_header}\" /Fp\"${PrecompiledBinary}\""
+ OBJECT_DEPENDS "${PrecompiledBinary}")
+ list(APPEND ${_source} ${_cpp})
</ins><span class="cx"> endif ()
</span><del>- #FIXME: Add Xcode precompiled header support.
- list(APPEND ${_output_source} ${PrecompiledSource})
</del><ins>+ #FIXME: Add support for Xcode.
</ins><span class="cx"> endmacro()
</span><span class="cx">
</span><span class="cx"> # Helper macro which wraps generate-bindings.pl script.
</span></span></pre></div>
<a id="trunkToolsCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CMakeLists.txt (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CMakeLists.txt 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Tools/CMakeLists.txt 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -27,6 +27,11 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (WIN32)
+ add_subdirectory(DumpRenderTree)
+ add_subdirectory(WinLauncher)
+endif ()
+
</ins><span class="cx"> if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
</span><span class="cx"> add_subdirectory(TestWebKitAPI)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182544 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-08 16:45:01 UTC (rev 182544)
+++ trunk/Tools/ChangeLog 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-08 Alex Christensen <achristensen@webkit.org> and Patrick Gansterer <paroga@webkit.org>
+
+ Add CMake build system for WinCairo port.
+ https://bugs.webkit.org/show_bug.cgi?id=115944
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ * WinLauncher/CMakeLists.txt: Added.
+
</ins><span class="cx"> 2015-04-08 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Crash in DOMObjectCache when a wrapped object owned by the cache is unreffed by the user
</span></span></pre></div>
<a id="trunkToolsWinLauncherCMakeListstxt"></a>
<div class="addfile"><h4>Added: trunk/Tools/WinLauncher/CMakeLists.txt (0 => 182545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/CMakeLists.txt (rev 0)
+++ trunk/Tools/WinLauncher/CMakeLists.txt 2015-04-08 16:47:56 UTC (rev 182545)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+set(WinLauncher_INCLUDE_DIRECTORIES
+ WinLauncher.vcxproj
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit"
+ "${DERIVED_SOURCES_DIR}"
+ "${WTF_DIR}"
+ "${CMAKE_SOURCE_DIR}"
+ "${CMAKE_SOURCE_DIR}/Source"
+)
+
+set(WinLauncher_SOURCES
+ AccessibilityDelegate.cpp
+ DOMDefaultImpl.cpp
+ PageLoadTestClient.cpp
+ PrintWebUIDelegate.cpp
+ ResourceLoadDelegate.cpp
+ WinLauncher.cpp
+ WinLauncherWebHost.cpp
+ WinMain.cpp
+ stdafx.cpp
+
+ WinLauncher.vcxproj/WinLauncherLib.rc
+)
+
+set(WinLauncher_LIBRARIES
+ CFLite
+ DbgHelp
+ WTF
+ WebKit
+ WebKitGUID
+ comctl32
+ comsupp
+ comsuppw
+ shlwapi
+)
+
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
+
+add_definitions(-D_UNICODE -DWIN_CAIRO)
+include_directories(${WinLauncher_INCLUDE_DIRECTORIES})
+add_library(WinLauncher SHARED ${WinLauncher_SOURCES})
+target_link_libraries(WinLauncher ${WinLauncher_LIBRARIES})
+set_target_properties(WinLauncher PROPERTIES FOLDER "Tools")
+
+add_executable(WinLauncherLauncher WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp WinLauncher.vcxproj/WinLauncher.rc)
+target_link_libraries(WinLauncherLauncher shlwapi)
+set_target_properties(WinLauncherLauncher PROPERTIES FOLDER "Tools")
+set_target_properties(WinLauncherLauncher PROPERTIES OUTPUT_NAME "WinLauncher")
</ins></span></pre>
</div>
</div>
</body>
</html>