<!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>[160805] trunk/Tools</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/160805">160805</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-18 16:10:15 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [CMake] Add support for building GtkLauncher
https://bugs.webkit.org/show_bug.cgi?id=125766
Reviewed by Gustavo Noronha Silva.
* CMakeLists.txt: Add the GtkLauncher subdirectory for the GTK port.
* GtkLauncher/CMakeLists.txt: Added.
* GtkLauncher/main.c: Support including the CMake config file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsCMakeListstxt">trunk/Tools/CMakeLists.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsGtkLaunchermainc">trunk/Tools/GtkLauncher/main.c</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsGtkLauncherCMakeListstxt">trunk/Tools/GtkLauncher/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CMakeLists.txt (160804 => 160805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CMakeLists.txt 2013-12-19 00:04:47 UTC (rev 160804)
+++ trunk/Tools/CMakeLists.txt 2013-12-19 00:10:15 UTC (rev 160805)
</span><span class="lines">@@ -19,6 +19,9 @@
</span><span class="cx"> if (ENABLE_WEBKIT2)
</span><span class="cx"> add_subdirectory(MiniBrowser/gtk)
</span><span class="cx"> endif ()
</span><ins>+ if (ENABLE_WEBKIT)
+ add_subdirectory(GtkLauncher)
+ endif ()
</ins><span class="cx"> elseif ("${PORT}" STREQUAL "WinCE")
</span><span class="cx"> add_subdirectory(WinCELauncher)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160804 => 160805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-19 00:04:47 UTC (rev 160804)
+++ trunk/Tools/ChangeLog 2013-12-19 00:10:15 UTC (rev 160805)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-18 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Add support for building GtkLauncher
+ https://bugs.webkit.org/show_bug.cgi?id=125766
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Add the GtkLauncher subdirectory for the GTK port.
+ * GtkLauncher/CMakeLists.txt: Added.
+ * GtkLauncher/main.c: Support including the CMake config file.
+
</ins><span class="cx"> 2013-12-18 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Preparation for GStreamer on Windows.
</span></span></pre></div>
<a id="trunkToolsGtkLauncherCMakeListstxt"></a>
<div class="addfile"><h4>Added: trunk/Tools/GtkLauncher/CMakeLists.txt (0 => 160805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/GtkLauncher/CMakeLists.txt (rev 0)
+++ trunk/Tools/GtkLauncher/CMakeLists.txt 2013-12-19 00:10:15 UTC (rev 160805)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+add_definitions(-DWEBKIT_EXEC_PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_SOURCE_DIR}/Source
+ ${CMAKE_SOURCE_DIR}/Source/JavaScriptCore/ForwardingHeaders
+ ${CMAKE_SOURCE_DIR}/Source/WebKit/gtk
+ ${DERIVED_SOURCES_DIR}
+ ${DERIVED_SOURCES_DIR}/webkit
+ ${GLIB_INCLUDE_DIRS}
+ ${GTK3_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
+)
+
+add_executable(GtkLauncher
+ LauncherInspectorWindow.c
+ LauncherInspectorWindow.h
+ main.c
+)
+
+target_link_libraries(GtkLauncher
+ ${JavaScriptCore_LIBRARY_NAME}
+ WebKit
+ ${GLIB_LIBRARIES}
+ ${GTK3_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
+)
+
</ins><span class="cx">Property changes on: trunk/Tools/GtkLauncher/CMakeLists.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkToolsGtkLaunchermainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/GtkLauncher/main.c (160804 => 160805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/GtkLauncher/main.c 2013-12-19 00:04:47 UTC (rev 160804)
+++ trunk/Tools/GtkLauncher/main.c 2013-12-19 00:10:15 UTC (rev 160805)
</span><span class="lines">@@ -25,7 +25,14 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+#ifdef BUILDING_WITH_CMAKE
+#include "cmakeconfig.h"
+#else
</ins><span class="cx"> #include "autotoolsconfig.h"
</span><ins>+#endif
+#endif
+
</ins><span class="cx"> #include "LauncherInspectorWindow.h"
</span><span class="cx"> #include <errno.h>
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span></span></pre>
</div>
</div>
</body>
</html>