<!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>[160361] 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/160361">160361</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-10 06:32:17 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Various fixes for the CMake GTK+ build
Reviewed by Gustavo Noronha.
.:
* Source/cmake/OptionsGTK.cmake: Disable Quota support to maintain consistency with
autotools build.
Source/WebCore:
* PlatformGTK.cmake: Update source list.
Source/WebKit2:
* CMakeLists.txt: Update the source lists.
* PlatformGTK.cmake: Ditto.
Source/WTF:
* wtf/PlatformGTK.cmake: Add Zlib library to the WTF build.
Tools:
* MiniBrowser/gtk/CMakeLists.txt: Update source list and correct the name of BrowserMarshal.h.
* TestWebKitAPI/PlatformGTK.cmake: Add GTK+ libraries to the test program. They're required.</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="#trunkSourceWTFwtfPlatformGTKcmake">trunk/Source/WTF/wtf/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsergtkCMakeListstxt">trunk/Tools/MiniBrowser/gtk/CMakeLists.txt</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformGTKcmake">trunk/Tools/TestWebKitAPI/PlatformGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/ChangeLog 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-10 Martin Robinson <mrobinson@igalia.com>
+
+ Various fixes for the CMake GTK+ build
+
+ Reviewed by Gustavo Noronha.
+
+ * Source/cmake/OptionsGTK.cmake: Disable Quota support to maintain consistency with
+ autotools build.
+
</ins><span class="cx"> 2013-12-09 Brian Holt <brian.holt@samsung.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Gtk] Add support for ENABLE_NETWORK_PROCESS to the build system
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WTF/ChangeLog 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2013-12-10 Martin Robinson <mrobinson@igalia.com>
+
+ Various fixes for the CMake GTK+ build
+
+ Reviewed by Gustavo Noronha.
+
+ * wtf/PlatformGTK.cmake: Add Zlib library to the WTF build.
+
</ins><span class="cx"> 2013-12-09 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove FixedArray
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> ${GLIB_GOBJECT_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><span class="cx"> pthread
</span><ins>+ ${ZLIB_LIBRARIES}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WTF_INCLUDE_DIRECTORIES
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WebCore/ChangeLog 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2013-12-10 Martin Robinson <mrobinson@igalia.com>
+
+ Various fixes for the CMake GTK+ build
+
+ Reviewed by Gustavo Noronha.
+
+ * PlatformGTK.cmake: Update source list.
+
</ins><span class="cx"> 2013-12-10 Robert Sipka <sipka@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> [nix][curl] Buildfix after r160310
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -43,6 +43,8 @@
</span><span class="cx">
</span><span class="cx"> editing/atk/FrameSelectionAtk.cpp
</span><span class="cx">
</span><ins>+ html/shadow/MediaControlsGtk.cpp
+
</ins><span class="cx"> loader/soup/CachedRawResourceSoup.cpp
</span><span class="cx"> loader/soup/SubresourceLoaderSoup.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WebKit2/CMakeLists.txt 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -290,6 +290,7 @@
</span><span class="cx"> UIProcess/APINavigationData.cpp
</span><span class="cx"> UIProcess/BackingStore.cpp
</span><span class="cx"> UIProcess/DrawingAreaProxy.cpp
</span><ins>+ UIProcess/DrawingAreaProxyImpl.cpp
</ins><span class="cx"> UIProcess/FindIndicator.cpp
</span><span class="cx"> UIProcess/FrameLoadState.cpp
</span><span class="cx"> UIProcess/GeolocationPermissionRequestManagerProxy.cpp
</span><span class="lines">@@ -548,6 +549,7 @@
</span><span class="cx">
</span><span class="cx"> WebProcess/WebPage/DecoderAdapter.cpp
</span><span class="cx"> WebProcess/WebPage/DrawingArea.cpp
</span><ins>+ WebProcess/WebPage/DrawingAreaImpl.cpp
</ins><span class="cx"> WebProcess/WebPage/EncoderAdapter.cpp
</span><span class="cx"> WebProcess/WebPage/EventDispatcher.cpp
</span><span class="cx"> WebProcess/WebPage/FindController.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-10 Martin Robinson <mrobinson@igalia.com>
+
+ Various fixes for the CMake GTK+ build
+
+ Reviewed by Gustavo Noronha.
+
+ * CMakeLists.txt: Update the source lists.
+ * PlatformGTK.cmake: Ditto.
+
</ins><span class="cx"> 2013-12-10 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WK2] [GTK] Enable the network process in the WebContext
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx">
</span><span class="cx"> Shared/API/c/cairo/WKImageCairo.cpp
</span><span class="cx">
</span><del>- Shared/API/c/gtk/WKGraphicsContextGtk.cpp
-
</del><span class="cx"> Shared/Downloads/gtk/DownloadSoupErrorsGtk.cpp
</span><span class="cx">
</span><span class="cx"> Shared/Downloads/soup/DownloadSoup.cpp
</span><span class="lines">@@ -82,6 +80,8 @@
</span><span class="cx"> UIProcess/API/gtk/PageClientImpl.h
</span><span class="cx"> UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
</span><span class="cx"> UIProcess/API/gtk/WebKitAuthenticationDialog.h
</span><ins>+ UIProcess/API/gtk/WebKitAuthenticationRequest.cpp
+ UIProcess/API/gtk/WebKitAuthenticationRequest.h
</ins><span class="cx"> UIProcess/API/gtk/WebKitBackForwardList.cpp
</span><span class="cx"> UIProcess/API/gtk/WebKitBackForwardList.h
</span><span class="cx"> UIProcess/API/gtk/WebKitBackForwardListItem.cpp
</span><span class="lines">@@ -104,6 +104,8 @@
</span><span class="cx"> UIProcess/API/gtk/WebKitCookieManager.cpp
</span><span class="cx"> UIProcess/API/gtk/WebKitCookieManager.h
</span><span class="cx"> UIProcess/API/gtk/WebKitCookieManagerPrivate.h
</span><ins>+ UIProcess/API/gtk/WebKitCredential.cpp
+ UIProcess/API/gtk/WebKitCredential.h
</ins><span class="cx"> UIProcess/API/gtk/WebKitDefines.h
</span><span class="cx"> UIProcess/API/gtk/WebKitDownload.cpp
</span><span class="cx"> UIProcess/API/gtk/WebKitDownload.h
</span><span class="lines">@@ -242,7 +244,6 @@
</span><span class="cx"> UIProcess/gtk/WebContextGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebContextMenuProxyGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebFullScreenClientGtk.cpp
</span><del>- UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
</del><span class="cx"> UIProcess/gtk/WebInspectorClientGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebInspectorProxyGtk.cpp
</span><span class="cx"> UIProcess/gtk/WebPageProxyGtk.cpp
</span><span class="lines">@@ -257,6 +258,11 @@
</span><span class="cx"> WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
</span><span class="cx"> WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
</span><span class="cx">
</span><ins>+ WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp
+
</ins><span class="cx"> WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp
</span><span class="cx">
</span><span class="cx"> WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp
</span><span class="lines">@@ -278,6 +284,8 @@
</span><span class="cx"> WebProcess/WebPage/gtk/WebPageGtk.cpp
</span><span class="cx"> WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
</span><span class="cx">
</span><ins>+ WebProcess/gtk/WebGtkExtensionManager.cpp
+ WebProcess/gtk/WebGtkInjectedBundleMain.cpp
</ins><span class="cx"> WebProcess/gtk/WebProcessMainGtk.cpp
</span><span class="cx">
</span><span class="cx"> WebProcess/soup/WebKitSoupRequestGeneric.cpp
</span><span class="lines">@@ -328,9 +336,20 @@
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWindowProperties.h
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/webkit2.h
</span><span class="cx">
</span><ins>+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFramePrivate.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorldPrivate.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp
</ins><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.h
</span><ins>+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtensionPrivate.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp
</ins><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h
</span><ins>+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPagePrivate.h
</ins><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
</span><ins>+
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_MESSAGES_IN_FILES
</span><span class="lines">@@ -347,6 +366,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_INCLUDE_DIRECTORIES
</span><ins>+ "${WEBCORE_DIR}/platform/cairo"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/gtk"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/cairo"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/cmake/OptionsGTK.cmake 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_INFO ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAGE_VISIBILITY_API ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REQUEST_ANIMATION_FRAME ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Tools/ChangeLog 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-10 Martin Robinson <mrobinson@igalia.com>
+
+ Various fixes for the CMake GTK+ build
+
+ Reviewed by Gustavo Noronha.
+
+ * MiniBrowser/gtk/CMakeLists.txt: Update source list and correct the name of BrowserMarshal.h.
+ * TestWebKitAPI/PlatformGTK.cmake: Add GTK+ libraries to the test program. They're required.
+
</ins><span class="cx"> 2013-12-10 László Langó <lango@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> --cloop option does not work in Tools/Scripts/build-jsc.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsergtkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -5,14 +5,16 @@
</span><span class="cx">
</span><span class="cx"> set(MiniBrowser_SOURCES
</span><span class="cx"> ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
</span><ins>+ ${MINIBROWSER_DIR}/BrowserCellRendererVariant.c
</ins><span class="cx"> ${MINIBROWSER_DIR}/BrowserCellRendererVariant.h
</span><del>- ${MINIBROWSER_DIR}/BrowserCellRendererVariant.c
</del><ins>+ ${MINIBROWSER_DIR}/BrowserDownloadsBar.c
</ins><span class="cx"> ${MINIBROWSER_DIR}/BrowserDownloadsBar.h
</span><del>- ${MINIBROWSER_DIR}/BrowserDownloadsBar.c
</del><ins>+ ${MINIBROWSER_DIR}/BrowserSearchBar.c
+ ${MINIBROWSER_DIR}/BrowserSearchBar.h
+ ${MINIBROWSER_DIR}/BrowserSettingsDialog.c
</ins><span class="cx"> ${MINIBROWSER_DIR}/BrowserSettingsDialog.h
</span><del>- ${MINIBROWSER_DIR}/BrowserSettingsDialog.c
</del><ins>+ ${MINIBROWSER_DIR}/BrowserWindow.c
</ins><span class="cx"> ${MINIBROWSER_DIR}/BrowserWindow.h
</span><del>- ${MINIBROWSER_DIR}/BrowserWindow.c
</del><span class="cx"> ${MINIBROWSER_DIR}/main.c
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -36,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
</span><del>- ${DERIVED_SOURCES_MINIBROWSER_DIR}/Browsermarshal.h
</del><ins>+ ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
</ins><span class="cx"> MAIN_DEPENDENCY ${MINIBROWSER_DIR}/browser-marshal.list
</span><span class="cx"> COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
</span><span class="cx"> COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (160360 => 160361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2013-12-10 14:32:17 UTC (rev 160361)
</span><span class="lines">@@ -54,6 +54,11 @@
</span><span class="cx"> ${GTK3_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+list(APPEND TestWebKitAPI_LIBRARIES
+ ${GDK3_LIBRARIES}
+ ${GTK3_LIBRARIES}
+)
+
</ins><span class="cx"> # The list below works like a test expectation. Tests in the
</span><span class="cx"> # test_{webkit2_api|webcore}_BINARIES list are added to the test runner and
</span><span class="cx"> # tried on the bots on every build. Tests in test_{webkit2_api|webcore}_BINARIES
</span></span></pre>
</div>
</div>
</body>
</html>