<!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>[170751] 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/170751">170751</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-03 06:36:45 -0700 (Thu, 03 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] The list of features shown by cmake is not accurate
https://bugs.webkit.org/show_bug.cgi?id=134588
Reviewed by Gustavo Noronha Silva.
The problem is that some options might change after the feature
list has been printed.
* Source/cmake/OptionsGTK.cmake: Find package dependencies before
setting the default values of features and set WEBGL value
depending on the dependencies, and API_TEST depending on whether
developer mode is enabled or not.</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 (170750 => 170751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-07-03 12:49:32 UTC (rev 170750)
+++ trunk/ChangeLog 2014-07-03 13:36:45 UTC (rev 170751)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-07-03 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] The list of features shown by cmake is not accurate
+ https://bugs.webkit.org/show_bug.cgi?id=134588
+
+ Reviewed by Gustavo Noronha Silva.
+
+ The problem is that some options might change after the feature
+ list has been printed.
+
+ * Source/cmake/OptionsGTK.cmake: Find package dependencies before
+ setting the default values of features and set WEBGL value
+ depending on the dependencies, and API_TEST depending on whether
+ developer mode is enabled or not.
+
</ins><span class="cx"> 2014-07-03 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMAKE] Add WEBKIT_OPTION_DEPEND macro to resolve macro dependency
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (170750 => 170751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-07-03 12:49:32 UTC (rev 170750)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-07-03 13:36:45 UTC (rev 170751)
</span><span class="lines">@@ -14,11 +14,45 @@
</span><span class="cx"> set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support for credential storage using libsecret.")
</span><span class="cx"> set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")
</span><span class="cx">
</span><del>-# FIXME: We want to expose fewer options to downstream, but for now everything is public.
</del><ins>+find_package(Cairo 1.10.2 REQUIRED)
+find_package(Fontconfig 2.8.0 REQUIRED)
+find_package(Freetype2 2.4.2 REQUIRED)
+find_package(GTK2 2.24.10 REQUIRED)
+find_package(GDK2 2.24.10 REQUIRED)
+find_package(HarfBuzz 0.9.2 REQUIRED)
+find_package(ICU REQUIRED)
+find_package(JPEG REQUIRED)
+find_package(LibSoup 2.40.3 REQUIRED)
+find_package(LibXml2 2.8.0 REQUIRED)
+find_package(LibXslt 1.1.7 REQUIRED)
+find_package(PNG REQUIRED)
+find_package(Sqlite REQUIRED)
+find_package(Threads REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(ATK REQUIRED)
+find_package(WebP REQUIRED)
+find_package(ATSPI 2.5.3)
+find_package(GObjectIntrospection)
+find_package(OpenGL)
+find_package(EGL)
+
</ins><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><ins>+if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND))
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)
+endif ()
+
+if (DEVELOPER_MODE)
+ set(ENABLE_TOOLS ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
+else ()
+ set(ENABLE_TOOLS OFF)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF)
+ set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/autotools/symbols.filter")
+endif ()
+
+# FIXME: We want to expose fewer options to downstream, but for now everything is public.
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)
</span><span class="lines">@@ -61,10 +95,10 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(WTF_USE_TILED_BACKING_STORE OFF)
</span><ins>+WEBKIT_OPTION_END()
</ins><span class="cx">
</span><span class="cx"> set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
</span><span class="cx"> set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayland windowing target.")
</span><span class="lines">@@ -81,17 +115,6 @@
</span><span class="cx"> add_definitions(-DWTF_PLATFORM_WAYLAND=1)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (DEVELOPER_MODE)
- set(ENABLE_TOOLS ON)
- set(ENABLE_API_TESTS ON)
-else ()
- set(ENABLE_TOOLS OFF)
- set(ENABLE_API_TESTS OFF)
- set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/autotools/symbols.filter")
-endif ()
-
-WEBKIT_OPTION_END()
-
</del><span class="cx"> set(ENABLE_WEBCORE ON)
</span><span class="cx"> set(ENABLE_INSPECTOR ON)
</span><span class="cx"> set(ENABLE_WEBKIT OFF)
</span><span class="lines">@@ -150,26 +173,6 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-find_package(Cairo 1.10.2 REQUIRED)
-find_package(Fontconfig 2.8.0 REQUIRED)
-find_package(Freetype2 2.4.2 REQUIRED)
-find_package(GTK2 2.24.10 REQUIRED)
-find_package(GDK2 2.24.10 REQUIRED)
-find_package(HarfBuzz 0.9.2 REQUIRED)
-find_package(ICU REQUIRED)
-find_package(JPEG REQUIRED)
-find_package(LibSoup 2.40.3 REQUIRED)
-find_package(LibXml2 2.8.0 REQUIRED)
-find_package(LibXslt 1.1.7 REQUIRED)
-find_package(PNG REQUIRED)
-find_package(Sqlite REQUIRED)
-find_package(Threads REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(ATK REQUIRED)
-find_package(WebP REQUIRED)
-find_package(ATSPI 2.5.3)
-find_package(GObjectIntrospection)
-
</del><span class="cx"> if (ENABLE_WAYLAND_TARGET)
</span><span class="cx"> set(GTK3_REQUIRED_VERSION 3.12.0)
</span><span class="cx"> else ()
</span><span class="lines">@@ -209,8 +212,6 @@
</span><span class="cx"> set(ENABLE_CREDENTIAL_STORAGE 1)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-find_package(OpenGL)
-
</del><span class="cx"> # This part can be simplified once CMake 2.8.6 is required and
</span><span class="cx"> # CMakePushCheckState can be used. We need to have OPENGL_INCLUDE_DIR as part
</span><span class="cx"> # of the directories check_include_files() looks for in case OpenGL is
</span><span class="lines">@@ -227,7 +228,6 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-find_package(EGL)
</del><span class="cx"> if (EGL_FOUND)
</span><span class="cx"> set(WTF_USE_EGL 1)
</span><span class="cx"> endif ()
</span><span class="lines">@@ -237,7 +237,6 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND))
</span><del>- set(ENABLE_WEBGL 1)
</del><span class="cx"> set(ENABLE_TEXTURE_MAPPER 1)
</span><span class="cx"> set(WTF_USE_3D_GRAPHICS 1)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>