<!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>[168692] releases/WebKitGTK/webkit-2.4/Source/WebKit2</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/168692">168692</a></dd>
<dt>Author</dt> <dd>gns@gnome.org</dd>
<dt>Date</dt> <dd>2014-05-13 12:25:09 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge 163032 - [GTK] [CMake] Fix the build after <a href="http://trac.webkit.org/projects/webkit/changeset/162835">r162835</a>
https://bugs.webkit.org/show_bug.cgi?id=127753
Reviewed by Gustavo Noronha Silva.
* CMakeLists.txt: Add support for using the prefix header (GCC / clang only for now)
when WebKit2_USE_PREFIX_HEADER is set to true.
* PlatformGTK.cmake: Set WebKit2_USE_PREFIX_HEADER support and no longer process some message.in files.
* WebKit2Prefix.h: Add support for the CMake GTK+ build.
Conflicts:
Source/WebKit2/ChangeLog</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2CMakeListstxt">releases/WebKitGTK/webkit-2.4/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2PlatformGTKcmake">releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebKit2Prefixh">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebKit2Prefix.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/CMakeLists.txt (168691 => 168692)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/CMakeLists.txt 2014-05-13 19:22:30 UTC (rev 168691)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/CMakeLists.txt 2014-05-13 19:25:09 UTC (rev 168692)
</span><span class="lines">@@ -690,6 +690,16 @@
</span><span class="cx"> list(APPEND WebKit2_LIBRARIES ${LIBRT_LIBRARIES})
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+macro(ADD_WEBKIT2_PREFIX_HEADER _target)
+ if (WebKit2_USE_PREFIX_HEADER)
+ get_target_property(OLD_COMPILE_FLAGS ${_target} COMPILE_FLAGS)
+ if (${OLD_COMPILE_FLAGS} STREQUAL "OLD_COMPILE_FLAGS-NOTFOUND")
+ set(OLD_COMPILE_FLAGS "")
+ endif ()
+ set_target_properties(${_target} PROPERTIES COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -include ${WEBKIT2_DIR}/WebKit2Prefix.h")
+ endif ()
+endmacro()
+
</ins><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span><span class="cx">
</span><span class="cx"> GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
</span><span class="lines">@@ -700,6 +710,7 @@
</span><span class="cx">
</span><span class="cx"> add_dependencies(WebKit2 WebCore)
</span><span class="cx"> add_dependencies(WebKit2 ${WEBKIT2_EXTRA_DEPENDENCIES})
</span><ins>+add_webkit2_prefix_header(WebKit2)
</ins><span class="cx"> target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
</span><span class="cx"> set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit")
</span><span class="cx"> set_target_properties(WebKit2 PROPERTIES LINK_INTERFACE_LIBRARIES "")
</span><span class="lines">@@ -709,6 +720,7 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> add_executable(WebProcess ${WebProcess_SOURCES})
</span><ins>+add_webkit2_prefix_header(WebProcess)
</ins><span class="cx"> target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
</span><span class="cx"> set_target_properties(WebProcess PROPERTIES FOLDER "WebKit")
</span><span class="cx">
</span><span class="lines">@@ -718,6 +730,7 @@
</span><span class="cx">
</span><span class="cx"> if (ENABLE_NETWORK_PROCESS)
</span><span class="cx"> add_executable(NetworkProcess ${NetworkProcess_SOURCES})
</span><ins>+ add_webkit2_prefix_header(NetworkProcess)
</ins><span class="cx"> target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
</span><span class="cx"> set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit")
</span><span class="cx"> install(TARGETS NetworkProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake (168691 => 168692)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake 2014-05-13 19:22:30 UTC (rev 168691)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake 2014-05-13 19:25:09 UTC (rev 168692)
</span><span class="lines">@@ -11,6 +11,8 @@
</span><span class="cx"> add_definitions(-DPACKAGE_LOCALE_DIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
</span><span class="cx"> add_definitions(-DLIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
</span><span class="cx">
</span><ins>+set(WebKit2_USE_PREFIX_HEADER ON)
+
</ins><span class="cx"> list(APPEND WebKit2_SOURCES
</span><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
</span><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
</span><span class="lines">@@ -377,12 +379,6 @@
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.js
</span><span class="cx"> )
</span><span class="cx">
</span><del>-list(APPEND WebKit2_MESSAGES_IN_FILES
- UIProcess/soup/WebSoupRequestManagerProxy.messages.in
-
- WebProcess/soup/WebSoupRequestManager.messages.in
-)
-
</del><span class="cx"> # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
</span><span class="cx"> list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
</span><span class="cx"> "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
</span><span class="lines">@@ -399,6 +395,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/soup"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/enchant"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/API/c/gtk"
</span><ins>+ "${WEBKIT2_DIR}/Shared/Network/CustomProtocols/soup"
</ins><span class="cx"> "${WEBKIT2_DIR}/Shared/Downloads/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/gtk"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/soup"
</span><span class="lines">@@ -628,6 +625,7 @@
</span><span class="cx"> GENERATE_WEBKIT2_MESSAGE_SOURCES(PluginProcess_SOURCES "${PluginProcess_MESSAGES_IN_FILES}")
</span><span class="cx">
</span><span class="cx"> add_executable(WebKitPluginProcess ${PluginProcess_SOURCES})
</span><ins>+ add_webkit2_prefix_header(WebKitPluginProcess)
</ins><span class="cx">
</span><span class="cx"> # We need ENABLE_PLUGIN_PROCESS for all targets in this directory, but
</span><span class="cx"> # we only want GTK_API_VERSION_2 for the plugin process target.
</span><span class="lines">@@ -672,10 +670,9 @@
</span><span class="cx"> "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-add_library(webkit2gtkinjectedbundle MODULE
- "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp"
-)
</del><ins>+add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp")
</ins><span class="cx"> add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
</span><ins>+add_webkit2_prefix_header(webkit2gtkinjectedbundle)
</ins><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebKit2Prefixh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebKit2Prefix.h (168691 => 168692)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebKit2Prefix.h 2014-05-13 19:22:30 UTC (rev 168691)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebKit2Prefix.h 2014-05-13 19:25:09 UTC (rev 168692)
</span><span class="lines">@@ -24,9 +24,13 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if defined (BUILDING_GTK__)
</del><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><del>-#endif /* defined (BUILDING_GTK__) */
</del><ins>+#endif
+#endif
</ins><span class="cx">
</span><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>