<!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>[183626] 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/183626">183626</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-30 09:17:08 -0700 (Thu, 30 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] Automatically expose WTF_USE_FOO to the build when USE_FOO is exposed
https://bugs.webkit.org/show_bug.cgi?id=144394
Reviewed by Carlos Garcia Campos.
Automatically expose WTF_USE_FOO when USE_FOO is exposed. A side-effect of this change
is that it fixes the redirected XComposite window for GTK+, which was accidentally
disabled in previous reworking of the CMake configuration.
* Source/cmake/OptionsGTK.cmake: We no longer need to expose the WTF_ prefixed
version of USE variables.
* Source/cmake/WebKitFeatures.cmake: Automatically expose WTF_USE_FOO when USE_FOO
is exposed to the build.</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>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (183625 => 183626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-04-30 08:54:05 UTC (rev 183625)
+++ trunk/ChangeLog 2015-04-30 16:17:08 UTC (rev 183626)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-04-30 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] Automatically expose WTF_USE_FOO to the build when USE_FOO is exposed
+ https://bugs.webkit.org/show_bug.cgi?id=144394
+
+ Reviewed by Carlos Garcia Campos.
+
+ Automatically expose WTF_USE_FOO when USE_FOO is exposed. A side-effect of this change
+ is that it fixes the redirected XComposite window for GTK+, which was accidentally
+ disabled in previous reworking of the CMake configuration.
+
+ * Source/cmake/OptionsGTK.cmake: We no longer need to expose the WTF_ prefixed
+ version of USE variables.
+ * Source/cmake/WebKitFeatures.cmake: Automatically expose WTF_USE_FOO when USE_FOO
+ is exposed to the build.
+
</ins><span class="cx"> 2015-04-30 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Bump GTK+ version numbers.
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (183625 => 183626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2015-04-30 08:54:05 UTC (rev 183625)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-04-30 16:17:08 UTC (rev 183626)
</span><span class="lines">@@ -352,14 +352,12 @@
</span><span class="cx"> if (NOT PC_GSTREAMER_MPEGTS_FOUND)
</span><span class="cx"> message(FATAL_ERROR "GStreamer MPEG-TS is needed for USE_GSTREAMER_MPEGTS.")
</span><span class="cx"> endif ()
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_GSTREAMER_MPEGTS TRUE)
</del><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (USE_GSTREAMER_GL)
</span><span class="cx"> if (NOT PC_GSTREAMER_GL_FOUND)
</span><span class="cx"> message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
</span><span class="cx"> endif ()
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_GSTREAMER_GL TRUE)
</del><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="lines">@@ -376,7 +374,6 @@
</span><span class="cx"> if (NOT LIBNOTIFY_FOUND)
</span><span class="cx"> message(FATAL_ERROR "libnotify is needed for USE_LIBNOTIFY.")
</span><span class="cx"> endif ()
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_LIBNOTIFY TRUE)
</del><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (USE_LIBHYPHEN)
</span><span class="lines">@@ -384,7 +381,6 @@
</span><span class="cx"> if (NOT HYPHEN_FOUND)
</span><span class="cx"> message(FATAL_ERROR "libhyphen is needed for USE_LIBHYPHEN.")
</span><span class="cx"> endif ()
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_LIBHYPHEN 1)
</del><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (183625 => 183626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2015-04-30 08:54:05 UTC (rev 183625)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2015-04-30 16:17:08 UTC (rev 183626)
</span><span class="lines">@@ -290,15 +290,28 @@
</span><span class="cx"> EXPOSE_VARIABLE_TO_BUILD(${_variable_name})
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><ins>+macro(_ADD_CONFIGURATION_LINE_TO_HEADER_STRING _string _variable_name _output_variable_name)
+ if (${${_variable_name}})
+ set(${_string} "${_file_contents}#define ${_output_variable_name} 1\n")
+ else ()
+ set(${_string} "${_file_contents}#define ${_output_variable_name} 0\n")
+ endif ()
+endmacro()
+
</ins><span class="cx"> macro(CREATE_CONFIGURATION_HEADER)
</span><span class="cx"> list(SORT _WEBKIT_CONFIG_FILE_VARIABLES)
</span><span class="cx"> set(_file_contents "#ifndef CMAKECONFIG_H\n")
</span><span class="cx"> set(_file_contents "${_file_contents}#define CMAKECONFIG_H\n\n")
</span><ins>+
</ins><span class="cx"> foreach (_variable_name ${_WEBKIT_CONFIG_FILE_VARIABLES})
</span><del>- if (${${_variable_name}})
- set(_file_contents "${_file_contents}#define ${_variable_name} 1\n")
- else ()
- set(_file_contents "${_file_contents}#define ${_variable_name} 0\n")
</del><ins>+ _ADD_CONFIGURATION_LINE_TO_HEADER_STRING(_file_contents ${_variable_name} ${_variable_name})
+
+ # WebKit looks for WTF_USE_FOO when calling the USE(FOO) macro. Automatically exposing
+ # this definition when USE_FOO is exposed, prevents us from having to expose both (or
+ # forgetting to do so).
+ string(FIND ${_variable_name} "USE_" _use_string_location)
+ if (${_use_string_location} EQUAL 0)
+ _ADD_CONFIGURATION_LINE_TO_HEADER_STRING(_file_contents ${_variable_name} "WTF_${_variable_name}")
</ins><span class="cx"> endif ()
</span><span class="cx"> endforeach ()
</span><span class="cx"> set(_file_contents "${_file_contents}\n#endif /* CMAKECONFIG_H */\n")
</span></span></pre>
</div>
</div>
</body>
</html>