<!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>[192095] 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/192095">192095</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2015-11-06 01:39:30 -0800 (Fri, 06 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Re-enable Quartz backend on cmake build system
https://bugs.webkit.org/show_bug.cgi?id=144561
Reviewed by Philippe Normand.
* Source/cmake/FindGTK3.cmake: Set GTK3_SUPPORTS_QUARTZ based on
the presence of of gtk+-quartz-3.0 module.
* Source/cmake/OptionsGTK.cmake: Reintroduce the
ENABLE_QUARTZ_TARGET option to the CMake build, for building the
GTK+ Quartz backend on OS X.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeFindGTK3cmake">trunk/Source/cmake/FindGTK3.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (192094 => 192095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-11-06 07:28:00 UTC (rev 192094)
+++ trunk/ChangeLog 2015-11-06 09:39:30 UTC (rev 192095)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-06 Philip Chimento <philip.chimento@gmail.com> and Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] Re-enable Quartz backend on cmake build system
+ https://bugs.webkit.org/show_bug.cgi?id=144561
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/FindGTK3.cmake: Set GTK3_SUPPORTS_QUARTZ based on
+ the presence of of gtk+-quartz-3.0 module.
+ * Source/cmake/OptionsGTK.cmake: Reintroduce the
+ ENABLE_QUARTZ_TARGET option to the CMake build, for building the
+ GTK+ Quartz backend on OS X.
+
</ins><span class="cx"> 2015-11-05 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
</span><span class="cx">
</span><span class="cx"> Add runtime and compile time flags for enabling Web Animations API and model.
</span></span></pre></div>
<a id="trunkSourcecmakeFindGTK3cmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindGTK3.cmake (192094 => 192095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGTK3.cmake 2015-11-06 07:28:00 UTC (rev 192094)
+++ trunk/Source/cmake/FindGTK3.cmake 2015-11-06 09:39:30 UTC (rev 192095)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> # GTK3_INCLUDE_DIRS - the GTK+ 3. include directories
</span><span class="cx"> # GTK3_LIBRARIES - link these to use GTK+ 3.
</span><span class="cx"> # GTK3_SUPPORTS_GESTURES - GTK+ supports gestures (GTK+ >= 3.14)
</span><ins>+# GTK3_SUPPORTS_QUARTZ - GTK+ supports Quartz backend
</ins><span class="cx"> # GTK3_SUPPORTS_X11 - GTK+ supports X11 backend
</span><span class="cx"> # GTK3_SUPPORTS_WAYLAND - GTK+ supports Wayland backend
</span><span class="cx"> #
</span><span class="lines">@@ -49,6 +50,11 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (GTK3_VERSION AND VERSION_OK)
</span><ins>+ pkg_check_modules(GTK3_QUARTZ gtk+-quartz-3.0)
+ if ("${GTK3_QUARTZ_VERSION}" VERSION_EQUAL "${GTK3_VERSION}")
+ set(GTK3_SUPPORTS_QUARTZ TRUE)
+ endif ()
+
</ins><span class="cx"> pkg_check_modules(GTK3_X11 gtk+-x11-3.0)
</span><span class="cx"> if ("${GTK3_X11_VERSION}" VERSION_EQUAL "${GTK3_VERSION}")
</span><span class="cx"> set(GTK3_SUPPORTS_X11 TRUE)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (192094 => 192095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2015-11-06 07:28:00 UTC (rev 192094)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-11-06 09:39:30 UTC (rev 192095)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." PUBLIC ON)
</span><ins>+WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ${GTK3_SUPPORTS_QUARTZ})
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ${GTK3_SUPPORTS_X11})
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ${GTK3_SUPPORTS_WAYLAND})
</span><span class="cx"> WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notification implementation." PUBLIC ON)
</span><span class="lines">@@ -186,6 +187,7 @@
</span><span class="cx"> # this point, and do not attempt to change any option after this point.
</span><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx">
</span><ins>+SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_QUARTZ ${ENABLE_QUARTZ_TARGET})
</ins><span class="cx"> SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_X11 ${ENABLE_X11_TARGET})
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_WAYLAND ${ENABLE_WAYLAND_TARGET})
</span><span class="cx">
</span><span class="lines">@@ -392,6 +394,12 @@
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (ENABLE_QUARTZ_TARGET)
+ if (NOT GTK3_SUPPORTS_QUARTZ)
+ message(FATAL_ERROR "Recompile GTK+ with Quartz backend to use ENABLE_QUARTZ_TARGET")
+ endif ()
+endif ()
+
</ins><span class="cx"> if (ENABLE_X11_TARGET)
</span><span class="cx"> if (NOT GTK3_SUPPORTS_X11)
</span><span class="cx"> message(FATAL_ERROR "Recompile GTK+ with X11 backend to use ENABLE_X11_TARGET")
</span></span></pre>
</div>
</div>
</body>
</html>