<!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>[165386] 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/165386">165386</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-10 11:35:55 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][CMAKE] gtk-doc HTML documentation is generated by default when building with CMake
https://bugs.webkit.org/show_bug.cgi?id=130016
Reviewed by Carlos Garcia Campos.
* Source/PlatformGTK.cmake: Add two gtkdoc targets, one which builds HTML and one which
doesn't. Add the non-HTML version to the default target, but not the HTML version. The
HTML version will still run when building the distribution tarball.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcePlatformGTKcmake">trunk/Source/PlatformGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (165385 => 165386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-10 18:30:07 UTC (rev 165385)
+++ trunk/ChangeLog 2014-03-10 18:35:55 UTC (rev 165386)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-03-10 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK][CMAKE] gtk-doc HTML documentation is generated by default when building with CMake
+ https://bugs.webkit.org/show_bug.cgi?id=130016
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/PlatformGTK.cmake: Add two gtkdoc targets, one which builds HTML and one which
+ doesn't. Add the non-HTML version to the default target, but not the HTML version. The
+ HTML version will still run when building the distribution tarball.
+
+2014-03-10 Martin Robinson <mrobinson@igalia.com>
+
</ins><span class="cx"> [GTK] [CMake] Clean up library linking
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=129782
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/PlatformGTK.cmake (165385 => 165386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformGTK.cmake 2014-03-10 18:30:07 UTC (rev 165385)
+++ trunk/Source/PlatformGTK.cmake 2014-03-10 18:35:55 UTC (rev 165386)
</span><span class="lines">@@ -29,26 +29,26 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-add_custom_command(
- OUTPUT "${CMAKE_BINARY_DIR}/docs-build.stamp"
- DEPENDS ${DocumentationDependencies}
- COMMAND CC="${CMAKE_C_COMPILER}" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc
- COMMAND touch docs-build.stamp
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
</del><ins>+macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
+ add_custom_command(
+ OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
+ DEPENDS ${DocumentationDependencies}
+ COMMAND CC="${CMAKE_C_COMPILER}" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args}
+ COMMAND touch ${_stamp_name}
+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+ )
+endmacro()
+
+add_gtkdoc_generator("docs-build-no-html.stamp" "--skip-html")
+add_custom_target(gtkdoc-no-html ALL
+ DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp"
</ins><span class="cx"> )
</span><span class="cx">
</span><del>-add_custom_target(fake-docs-target ALL
</del><ins>+add_gtkdoc_generator("docs-build.stamp" "")
+add_custom_target(gtkdoc
</ins><span class="cx"> DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (ENABLE_WEBKIT)
- add_dependencies(fake-docs-target WebKit)
-endif ()
-
-if (ENABLE_WEBKIT2)
- add_dependencies(fake-docs-target WebKit2)
-endif ()
-
</del><span class="cx"> add_custom_target(check
</span><span class="cx"> COMMAND ${TOOLS_DIR}/Scripts/run-gtk-tests
</span><span class="cx"> COMMAND ${TOOLS_DIR}/gtk/check-for-webkitdom-api-breaks
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
</span><span class="cx"> DEPENDS WebKit
</span><span class="cx"> DEPENDS WebKit2
</span><ins>+ DEPENDS gtkdoc
</ins><span class="cx"> COMMAND ${TOOLS_DIR}/gtk/make-dist.py
</span><span class="cx"> --source-dir=${CMAKE_SOURCE_DIR}
</span><span class="cx"> --build-dir=${CMAKE_BINARY_DIR}
</span></span></pre>
</div>
</div>
</body>
</html>