<!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>[185788] 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/185788">185788</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2015-06-19 19:41:09 -0700 (Fri, 19 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] FindGTK3.cmake should not modify the values of build options
https://bugs.webkit.org/show_bug.cgi?id=144613
Reviewed by Martin Robinson.
* Source/cmake/FindGTK3.cmake: Do not check or set the value of ENABLE_X11_TARGET and
ENABLE_WAYLAND_TARGET. Instead, simply define the variables GTK3_SUPPORTS_X11 and
GTK3_SUPPORTS_WAYLAND as appropriate. Also, rename GTK_SUPPORTS_GESTURES to
GTK3_SUPPORTS_GESTURES for consistency.
* Source/cmake/OptionsGTK.cmake: Fail the build if the appropriate GTK+ backend is not
available. It's not possible to automatically select a backend correctly anymore, since all
options are set at the same time.</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 (185787 => 185788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-06-20 01:46:17 UTC (rev 185787)
+++ trunk/ChangeLog 2015-06-20 02:41:09 UTC (rev 185788)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-19 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] FindGTK3.cmake should not modify the values of build options
+ https://bugs.webkit.org/show_bug.cgi?id=144613
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/FindGTK3.cmake: Do not check or set the value of ENABLE_X11_TARGET and
+ ENABLE_WAYLAND_TARGET. Instead, simply define the variables GTK3_SUPPORTS_X11 and
+ GTK3_SUPPORTS_WAYLAND as appropriate. Also, rename GTK_SUPPORTS_GESTURES to
+ GTK3_SUPPORTS_GESTURES for consistency.
+ * Source/cmake/OptionsGTK.cmake: Fail the build if the appropriate GTK+ backend is not
+ available. It's not possible to automatically select a backend correctly anymore, since all
+ options are set at the same time.
+
</ins><span class="cx"> 2015-06-19 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary svn:executable flags
</span></span></pre></div>
<a id="trunkSourcecmakeFindGTK3cmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindGTK3.cmake (185787 => 185788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGTK3.cmake 2015-06-20 01:46:17 UTC (rev 185787)
+++ trunk/Source/cmake/FindGTK3.cmake 2015-06-20 02:41:09 UTC (rev 185788)
</span><span class="lines">@@ -4,9 +4,12 @@
</span><span class="cx"> # GTK3_FOUND - system has GTK+ 3.
</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><ins>+# GTK3_SUPPORTS_GESTURES - GTK+ supports gestures (GTK+ >= 3.14)
+# GTK3_SUPPORTS_X11 - GTK+ supports X11 backend
+# GTK3_SUPPORTS_WAYLAND - GTK+ supports Wayland backend
</ins><span class="cx"> #
</span><span class="cx"> # Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
</span><del>-# Copyright (C) 2013 Igalia S.L.
</del><ins>+# Copyright (C) 2013, 2015 Igalia S.L.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -45,30 +48,23 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (GTK3_VERSION AND VERSION_OK AND ENABLE_X11_TARGET)
</del><ins>+if (GTK3_VERSION AND VERSION_OK)
</ins><span class="cx"> pkg_check_modules(GTK3_X11 gtk+-x11-3.0)
</span><del>- if (NOT("${GTK3_X11_VERSION}" VERSION_EQUAL "${GTK3_VERSION}"))
- set(ENABLE_X11_TARGET OFF)
</del><ins>+ if ("${GTK3_X11_VERSION}" VERSION_EQUAL "${GTK3_VERSION}")
+ set(GTK3_SUPPORTS_X11 TRUE)
</ins><span class="cx"> endif ()
</span><del>-endif ()
</del><span class="cx">
</span><del>-if (GTK3_VERSION AND VERSION_OK AND ENABLE_WAYLAND_TARGET)
</del><span class="cx"> pkg_check_modules(GTK3_WAYLAND gtk+-wayland-3.0)
</span><del>- if (NOT("${GTK3_WAYLAND_VERSION}" VERSION_EQUAL "${GTK3_VERSION}"))
- set(ENABLE_WAYLAND_TARGET OFF)
</del><ins>+ if ("${GTK3_WAYLAND_VERSION}" VERSION_EQUAL "${GTK3_VERSION}")
+ set(GTK3_SUPPORTS_WAYLAND TRUE)
</ins><span class="cx"> endif ()
</span><del>-endif ()
</del><span class="cx">
</span><del>-if (NOT(ENABLE_X11_TARGET OR ENABLE_WAYLAND_TARGET))
- message(FATAL_ERROR "At least one of the following windowing targets must "
- "be enabled and also supported by the GTK+ dependency: X11, Wayland")
</del><ins>+ if (NOT("${GTK3_VERSION}" VERSION_LESS "3.14.0"))
+ set(GTK3_SUPPORTS_GESTURES ON)
+ else ()
+ set(GTK3_SUPPORTS_GESTURES OFF)
+ endif ()
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (GTK3_VERSION AND VERSION_OK AND NOT("${GTK3_VERSION}" VERSION_LESS "3.14.0"))
- set(GTK_SUPPORTS_GESTURES ON)
-else ()
- set(GTK_SUPPORTS_GESTURES OFF)
-endif ()
-
</del><span class="cx"> include(FindPackageHandleStandardArgs)
</span><span class="cx"> FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARIES VERSION_OK)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (185787 => 185788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2015-06-20 01:46:17 UTC (rev 185787)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-06-20 02:41:09 UTC (rev 185788)
</span><span class="lines">@@ -237,8 +237,8 @@
</span><span class="cx"> set(GDK_LIBRARIES ${GDK3_LIBRARIES})
</span><span class="cx"> set(GDK_INCLUDE_DIRS ${GDK3_INCLUDE_DIRS})
</span><span class="cx">
</span><ins>+SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_GESTURES ${GTK3_SUPPORTS_GESTURES})
</ins><span class="cx"> SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTK_UNIX_PRINT_FOUND})
</span><del>-SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_GESTURES ${GTK_SUPPORTS_GESTURES})
</del><span class="cx">
</span><span class="cx"> set(glib_components gio gobject gthread gmodule)
</span><span class="cx"> if (ENABLE_GAMEPAD_DEPRECATED OR ENABLE_GEOLOCATION)
</span><span class="lines">@@ -378,6 +378,10 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_X11_TARGET)
</span><ins>+ if (NOT GTK3_SUPPORTS_X11)
+ message(FATAL_ERROR "Recompile GTK+ with X11 backend to use ENABLE_X11_TARGET")
+ endif ()
+
</ins><span class="cx"> find_package(X11 REQUIRED)
</span><span class="cx"> if (NOT X11_Xcomposite_FOUND)
</span><span class="cx"> message(FATAL_ERROR "libXcomposite is required for ENABLE_X11_TARGET")
</span><span class="lines">@@ -391,6 +395,10 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WAYLAND_TARGET)
</span><ins>+ if (NOT GTK3_SUPPORTS_WAYLAND)
+ message(FATAL_ERROR "Recompile GTK+ with Wayland backend to use ENABLE_WAYLAND_TARGET")
+ endif ()
+
</ins><span class="cx"> find_package(Wayland REQUIRED)
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>