<!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>[166501] 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/166501">166501</a></dd>
<dt>Author</dt> <dd>rakuco@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-31 07:44:32 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake][GTK] Do not expand variables twice in if() checks.
https://bugs.webkit.org/show_bug.cgi?id=130964
Reviewed by Martin Robinson.
In CMake, `if (${foo})' causes $foo to be evaluated first and its value
to be checked by the if clause. This is not what we want, and
configuration fails when, say, GLX support wasn't found as the if
clause is actually evaluated as `if (TRUE AND (OR TRUE))'.
* Source/cmake/OptionsGTK.cmake: Pass if (FOO) instead of if (${FOO})
where necessary.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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 (166500 => 166501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-31 14:39:14 UTC (rev 166500)
+++ trunk/ChangeLog 2014-03-31 14:44:32 UTC (rev 166501)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-31 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+
+ [CMake][GTK] Do not expand variables twice in if() checks.
+ https://bugs.webkit.org/show_bug.cgi?id=130964
+
+ Reviewed by Martin Robinson.
+
+ In CMake, `if (${foo})' causes $foo to be evaluated first and its value
+ to be checked by the if clause. This is not what we want, and
+ configuration fails when, say, GLX support wasn't found as the if
+ clause is actually evaluated as `if (TRUE AND (OR TRUE))'.
+
+ * Source/cmake/OptionsGTK.cmake: Pass if (FOO) instead of if (${FOO})
+ where necessary.
+
</ins><span class="cx"> 2014-03-31 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove scripts code only applicable to autotools
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (166500 => 166501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-03-31 14:39:14 UTC (rev 166500)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-03-31 14:44:32 UTC (rev 166501)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> find_package(Enchant REQUIRED)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (${OPENGL_FOUND} AND (${GLX_FOUND} OR ${EGL_FOUND}))
</del><ins>+if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND))
</ins><span class="cx"> set(ENABLE_WEBGL 1)
</span><span class="cx"> set(ENABLE_TEXTURE_MAPPER 1)
</span><span class="cx"> set(WTF_USE_3D_GRAPHICS 1)
</span><span class="lines">@@ -247,11 +247,11 @@
</span><span class="cx"> add_definitions(-DWTF_USE_TEXTURE_MAPPER_GL=1)
</span><span class="cx"> add_definitions(-DENABLE_3D_RENDERING=1)
</span><span class="cx">
</span><del>- if (${EGL_FOUND})
</del><ins>+ if (EGL_FOUND)
</ins><span class="cx"> add_definitions(-DWTF_USE_EGL=1)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>- if (${GLX_FOUND})
</del><ins>+ if (GLX_FOUND)
</ins><span class="cx"> add_definitions(-DWTF_USE_GLX=1)
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span></span></pre>
</div>
</div>
</body>
</html>