<!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>[184063] 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/184063">184063</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-10 20:07:09 -0700 (Sun, 10 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CMake defines CAIROGL_FOUND, not CAIRO_GL_FOUND
https://bugs.webkit.org/show_bug.cgi?id=144846
Patch by Philip Chimento <philip.chimento@gmail.com> on 2015-05-10
Reviewed by Martin Robinson.
* Source/cmake/FindCairoGL.cmake: Use CAIROGL_* instead of
CAIRO_GL_* throughout, because find_package will define
CAIROGL_FOUND.
* Source/cmake/OptionsGTK.cmake: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeFindCairoGLcmake">trunk/Source/cmake/FindCairoGL.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 (184062 => 184063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-05-11 03:03:07 UTC (rev 184062)
+++ trunk/ChangeLog 2015-05-11 03:07:09 UTC (rev 184063)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-05-10 Philip Chimento <philip.chimento@gmail.com>
</span><span class="cx">
</span><ins>+ CMake defines CAIROGL_FOUND, not CAIRO_GL_FOUND
+ https://bugs.webkit.org/show_bug.cgi?id=144846
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/FindCairoGL.cmake: Use CAIROGL_* instead of
+ CAIRO_GL_* throughout, because find_package will define
+ CAIROGL_FOUND.
+ * Source/cmake/OptionsGTK.cmake: Ditto.
+
+2015-05-10 Philip Chimento <philip.chimento@gmail.com>
+
</ins><span class="cx"> [CMake] Some macros need to be defined/undefined, rather than ON/OFF
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144845
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeFindCairoGLcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindCairoGL.cmake (184062 => 184063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindCairoGL.cmake 2015-05-11 03:03:07 UTC (rev 184062)
+++ trunk/Source/cmake/FindCairoGL.cmake 2015-05-11 03:07:09 UTC (rev 184063)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> # - Try to find CairoGL
</span><span class="cx"> # Once done, this will define
</span><span class="cx"> #
</span><del>-# CAIRO_GL_FOUND - system has CairoGL
-# CAIRO_GL_INCLUDE_DIRS - the CairoGL include directories
-# CAIRO_GL_LIBRARIES - link these to use CairoGL
</del><ins>+# CAIROGL_FOUND - system has CairoGL
+# CAIROGL_INCLUDE_DIRS - the CairoGL include directories
+# CAIROGL_LIBRARIES - link these to use CairoGL
</ins><span class="cx"> #
</span><span class="cx"> # Copyright (C) 2014 Igalia S.L.
</span><span class="cx"> #
</span><span class="lines">@@ -29,18 +29,18 @@
</span><span class="cx"> # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> find_package(PkgConfig)
</span><del>-pkg_check_modules(CAIRO_GL cairo-gl)
</del><ins>+pkg_check_modules(CAIROGL cairo-gl)
</ins><span class="cx">
</span><span class="cx"> # At the moment CairoGL does not add any extra cflags and libraries, so we can
</span><del>-# safely ignore CAIRO_GL_LIBRARIES and CAIRO_GL_INCLUDE_DIRS for the moment.
</del><ins>+# safely ignore CAIROGL_LIBRARIES and CAIROGL_INCLUDE_DIRS for the moment.
</ins><span class="cx"> foreach (_component ${CairoGL_FIND_COMPONENTS})
</span><span class="cx"> string(TOUPPER ${_component} _UPPER_NAME)
</span><span class="cx"> string(REGEX REPLACE "-" "_" _UPPER_NAME ${_UPPER_NAME})
</span><span class="cx"> pkg_check_modules(${_UPPER_NAME} ${_component})
</span><del>- set(CAIRO_GL_INCLUDE_DIRS ${CAIRO_GL_INCLUDE_DIRS} ${_UPPER_NAME}_INCLUDE_DIRS)
- set(CAIRO_GL_LIBRARIES ${CAIRO_GL_LIBRARIES} ${_UPPER_NAME}_LIBRARIES)
</del><ins>+ set(CAIROGL_INCLUDE_DIRS ${CAIROGL_INCLUDE_DIRS} ${_UPPER_NAME}_INCLUDE_DIRS)
+ set(CAIROGL_LIBRARIES ${CAIROGL_LIBRARIES} ${_UPPER_NAME}_LIBRARIES)
</ins><span class="cx"> endforeach ()
</span><span class="cx">
</span><span class="cx"> include(FindPackageHandleStandardArgs)
</span><del>-find_package_handle_standard_args(CairoGL DEFAULT_MSG CAIRO_GL_INCLUDE_DIRS CAIRO_GL_LIBRARIES)
</del><ins>+find_package_handle_standard_args(CairoGL DEFAULT_MSG CAIROGL_INCLUDE_DIRS CAIROGL_LIBRARIES)
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (184062 => 184063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2015-05-11 03:03:07 UTC (rev 184062)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-05-11 03:07:09 UTC (rev 184063)
</span><span class="lines">@@ -102,12 +102,12 @@
</span><span class="cx"> CMAKE_POP_CHECK_STATE()
</span><span class="cx">
</span><span class="cx"> if (GLX_FOUND)
</span><del>- list(APPEND CAIRO_GL_COMPONENTS cairo-glx)
</del><ins>+ list(APPEND CAIROGL_COMPONENTS cairo-glx)
</ins><span class="cx"> endif ()
</span><span class="cx"> if (EGL_FOUND)
</span><del>- list(APPEND CAIRO_GL_COMPONENTS cairo-egl)
</del><ins>+ list(APPEND CAIROGL_COMPONENTS cairo-egl)
</ins><span class="cx"> endif ()
</span><del>- find_package(CairoGL 1.10.2 COMPONENTS ${CAIRO_GL_COMPONENTS})
</del><ins>+ find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> # Normally we do not set the value of options automatically. However, CairoGL is special. Currently
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> # EGL is not, and ENABLE_X11_TARGET is OFF, this guess is wrong and the user must override it. We
</span><span class="cx"> # can't check ENABLE_X11_TARGET at this point because we don't know whether it's enabled until
</span><span class="cx"> # WEBKIT_OPTION_END has been called, and at that point it's too late to change default values.
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC ${CAIRO_GL_FOUND})
</del><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC ${CAIROGL_FOUND})
</ins><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CREDENTIAL_STORAGE PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
</span></span></pre>
</div>
</div>
</body>
</html>