<!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>[168715] releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake</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/168715">168715</a></dd>
<dt>Author</dt> <dd>gns@gnome.org</dd>
<dt>Date</dt> <dd>2014-05-13 12:30:41 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge 165166 - [GTK][CMake] The GObject DOM bindings should always be built
https://bugs.webkit.org/show_bug.cgi?id=127963
Reviewed by Ryosuke Niwa.
* PlatformGTK.cmake: Make compilation of the WebKitGTK+ GObject DOM bindings
unconditional, instead of conditional on the WebKit2 build.
Conflicts:
Source/WebCore/ChangeLog
Source/WebCore/PlatformGTK.cmake</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorePlatformGTKcmake">releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake (168714 => 168715)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake 2014-05-13 19:30:31 UTC (rev 168714)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake 2014-05-13 19:30:41 UTC (rev 168715)
</span><span class="lines">@@ -470,292 +470,289 @@
</span><span class="cx"> ${GDK_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (ENABLE_WEBKIT2)
- include_directories(
- "${WebCore_INCLUDE_DIRECTORIES}"
- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
- )
</del><ins>+include_directories(
+ "${WebCore_INCLUDE_DIRECTORIES}"
+ "${DERIVED_SOURCES_DIR}"
+ "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
+)
</ins><span class="cx">
</span><del>- list(APPEND GObjectDOMBindings_SOURCES
- bindings/gobject/ConvertToUTF8String.cpp
- bindings/gobject/DOMObjectCache.cpp
- bindings/gobject/GObjectEventListener.cpp
- bindings/gobject/WebKitDOMCustom.cpp
- bindings/gobject/WebKitDOMDeprecated.cpp
- bindings/gobject/WebKitDOMEventTarget.cpp
- bindings/gobject/WebKitDOMHTMLPrivate.cpp
- bindings/gobject/WebKitDOMObject.cpp
- bindings/gobject/WebKitDOMPrivate.cpp
- ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
- ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
- )
</del><ins>+list(APPEND GObjectDOMBindings_SOURCES
+ bindings/gobject/ConvertToUTF8String.cpp
+ bindings/gobject/DOMObjectCache.cpp
+ bindings/gobject/GObjectEventListener.cpp
+ bindings/gobject/WebKitDOMCustom.cpp
+ bindings/gobject/WebKitDOMDeprecated.cpp
+ bindings/gobject/WebKitDOMEventTarget.cpp
+ bindings/gobject/WebKitDOMHTMLPrivate.cpp
+ bindings/gobject/WebKitDOMObject.cpp
+ bindings/gobject/WebKitDOMPrivate.cpp
+ ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
+ ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
+)
</ins><span class="cx">
</span><del>- list(APPEND GObjectDOMBindings_IDL_FILES
- Modules/battery/BatteryManager.idl
- Modules/gamepad/Gamepad.idl
- Modules/gamepad/GamepadList.idl
- Modules/geolocation/Geolocation.idl
- Modules/mediasource/VideoPlaybackQuality.idl
- Modules/quota/StorageInfo.idl
- Modules/quota/StorageQuota.idl
- Modules/webdatabase/Database.idl
</del><ins>+list(APPEND GObjectDOMBindings_IDL_FILES
+ Modules/battery/BatteryManager.idl
+ Modules/gamepad/Gamepad.idl
+ Modules/gamepad/GamepadList.idl
+ Modules/geolocation/Geolocation.idl
+ Modules/mediasource/VideoPlaybackQuality.idl
+ Modules/quota/StorageInfo.idl
+ Modules/quota/StorageQuota.idl
+ Modules/webdatabase/Database.idl
</ins><span class="cx">
</span><del>- css/CSSRule.idl
- css/CSSRuleList.idl
- css/CSSStyleDeclaration.idl
- css/CSSStyleSheet.idl
- css/CSSValue.idl
- css/DOMWindowCSS.idl
- css/MediaList.idl
- css/MediaQueryList.idl
- css/StyleMedia.idl
- css/StyleSheet.idl
- css/StyleSheetList.idl
</del><ins>+ css/CSSRule.idl
+ css/CSSRuleList.idl
+ css/CSSStyleDeclaration.idl
+ css/CSSStyleSheet.idl
+ css/CSSValue.idl
+ css/DOMWindowCSS.idl
+ css/MediaList.idl
+ css/MediaQueryList.idl
+ css/StyleMedia.idl
+ css/StyleSheet.idl
+ css/StyleSheetList.idl
</ins><span class="cx">
</span><del>- dom/Attr.idl
- dom/CDATASection.idl
- dom/CharacterData.idl
- dom/Comment.idl
- dom/DOMImplementation.idl
- dom/DOMNamedFlowCollection.idl
- dom/DOMStringList.idl
- dom/DOMStringMap.idl
- dom/Document.idl
- dom/DocumentFragment.idl
- dom/DocumentType.idl
- dom/Element.idl
- dom/EntityReference.idl
- dom/Event.idl
- dom/KeyboardEvent.idl
- dom/MessagePort.idl
- dom/MouseEvent.idl
- dom/NamedNodeMap.idl
- dom/Node.idl
- dom/NodeFilter.idl
- dom/NodeIterator.idl
- dom/NodeList.idl
- dom/ProcessingInstruction.idl
- dom/Range.idl
- dom/ShadowRoot.idl
- dom/Text.idl
- dom/Touch.idl
- dom/TreeWalker.idl
- dom/UIEvent.idl
- dom/WebKitNamedFlow.idl
- dom/WheelEvent.idl
</del><ins>+ dom/Attr.idl
+ dom/CDATASection.idl
+ dom/CharacterData.idl
+ dom/Comment.idl
+ dom/DOMImplementation.idl
+ dom/DOMNamedFlowCollection.idl
+ dom/DOMStringList.idl
+ dom/DOMStringMap.idl
+ dom/Document.idl
+ dom/DocumentFragment.idl
+ dom/DocumentType.idl
+ dom/Element.idl
+ dom/EntityReference.idl
+ dom/Event.idl
+ dom/KeyboardEvent.idl
+ dom/MessagePort.idl
+ dom/MouseEvent.idl
+ dom/NamedNodeMap.idl
+ dom/Node.idl
+ dom/NodeFilter.idl
+ dom/NodeIterator.idl
+ dom/NodeList.idl
+ dom/ProcessingInstruction.idl
+ dom/Range.idl
+ dom/ShadowRoot.idl
+ dom/Text.idl
+ dom/Touch.idl
+ dom/TreeWalker.idl
+ dom/UIEvent.idl
+ dom/WebKitNamedFlow.idl
+ dom/WheelEvent.idl
</ins><span class="cx">
</span><del>- fileapi/Blob.idl
- fileapi/File.idl
- fileapi/FileList.idl
</del><ins>+ fileapi/Blob.idl
+ fileapi/File.idl
+ fileapi/FileList.idl
</ins><span class="cx">
</span><del>- html/DOMSettableTokenList.idl
- html/DOMTokenList.idl
- html/HTMLAnchorElement.idl
- html/HTMLAppletElement.idl
- html/HTMLAreaElement.idl
- html/HTMLBRElement.idl
- html/HTMLBaseElement.idl
- html/HTMLBaseFontElement.idl
- html/HTMLBodyElement.idl
- html/HTMLButtonElement.idl
- html/HTMLCanvasElement.idl
- html/HTMLCollection.idl
- html/HTMLDListElement.idl
- html/HTMLDetailsElement.idl
- html/HTMLDirectoryElement.idl
- html/HTMLDivElement.idl
- html/HTMLDocument.idl
- html/HTMLElement.idl
- html/HTMLEmbedElement.idl
- html/HTMLFieldSetElement.idl
- html/HTMLFontElement.idl
- html/HTMLFormElement.idl
- html/HTMLFrameElement.idl
- html/HTMLFrameSetElement.idl
- html/HTMLHRElement.idl
- html/HTMLHeadElement.idl
- html/HTMLHeadingElement.idl
- html/HTMLHtmlElement.idl
- html/HTMLIFrameElement.idl
- html/HTMLImageElement.idl
- html/HTMLInputElement.idl
- html/HTMLKeygenElement.idl
- html/HTMLLIElement.idl
- html/HTMLLabelElement.idl
- html/HTMLLegendElement.idl
- html/HTMLLinkElement.idl
- html/HTMLMapElement.idl
- html/HTMLMarqueeElement.idl
- html/HTMLMediaElement.idl
- html/HTMLMenuElement.idl
- html/HTMLMetaElement.idl
- html/HTMLModElement.idl
- html/HTMLOListElement.idl
- html/HTMLObjectElement.idl
- html/HTMLOptGroupElement.idl
- html/HTMLOptionElement.idl
- html/HTMLOptionsCollection.idl
- html/HTMLParagraphElement.idl
- html/HTMLParamElement.idl
- html/HTMLPreElement.idl
- html/HTMLQuoteElement.idl
- html/HTMLScriptElement.idl
- html/HTMLSelectElement.idl
- html/HTMLStyleElement.idl
- html/HTMLTableCaptionElement.idl
- html/HTMLTableCellElement.idl
- html/HTMLTableColElement.idl
- html/HTMLTableElement.idl
- html/HTMLTableRowElement.idl
- html/HTMLTableSectionElement.idl
- html/HTMLTextAreaElement.idl
- html/HTMLTitleElement.idl
- html/HTMLUListElement.idl
- html/MediaController.idl
- html/MediaError.idl
- html/TimeRanges.idl
- html/ValidityState.idl
</del><ins>+ html/DOMSettableTokenList.idl
+ html/DOMTokenList.idl
+ html/HTMLAnchorElement.idl
+ html/HTMLAppletElement.idl
+ html/HTMLAreaElement.idl
+ html/HTMLBRElement.idl
+ html/HTMLBaseElement.idl
+ html/HTMLBaseFontElement.idl
+ html/HTMLBodyElement.idl
+ html/HTMLButtonElement.idl
+ html/HTMLCanvasElement.idl
+ html/HTMLCollection.idl
+ html/HTMLDListElement.idl
+ html/HTMLDetailsElement.idl
+ html/HTMLDirectoryElement.idl
+ html/HTMLDivElement.idl
+ html/HTMLDocument.idl
+ html/HTMLElement.idl
+ html/HTMLEmbedElement.idl
+ html/HTMLFieldSetElement.idl
+ html/HTMLFontElement.idl
+ html/HTMLFormElement.idl
+ html/HTMLFrameElement.idl
+ html/HTMLFrameSetElement.idl
+ html/HTMLHRElement.idl
+ html/HTMLHeadElement.idl
+ html/HTMLHeadingElement.idl
+ html/HTMLHtmlElement.idl
+ html/HTMLIFrameElement.idl
+ html/HTMLImageElement.idl
+ html/HTMLInputElement.idl
+ html/HTMLKeygenElement.idl
+ html/HTMLLIElement.idl
+ html/HTMLLabelElement.idl
+ html/HTMLLegendElement.idl
+ html/HTMLLinkElement.idl
+ html/HTMLMapElement.idl
+ html/HTMLMarqueeElement.idl
+ html/HTMLMediaElement.idl
+ html/HTMLMenuElement.idl
+ html/HTMLMetaElement.idl
+ html/HTMLModElement.idl
+ html/HTMLOListElement.idl
+ html/HTMLObjectElement.idl
+ html/HTMLOptGroupElement.idl
+ html/HTMLOptionElement.idl
+ html/HTMLOptionsCollection.idl
+ html/HTMLParagraphElement.idl
+ html/HTMLParamElement.idl
+ html/HTMLPreElement.idl
+ html/HTMLQuoteElement.idl
+ html/HTMLScriptElement.idl
+ html/HTMLSelectElement.idl
+ html/HTMLStyleElement.idl
+ html/HTMLTableCaptionElement.idl
+ html/HTMLTableCellElement.idl
+ html/HTMLTableColElement.idl
+ html/HTMLTableElement.idl
+ html/HTMLTableRowElement.idl
+ html/HTMLTableSectionElement.idl
+ html/HTMLTextAreaElement.idl
+ html/HTMLTitleElement.idl
+ html/HTMLUListElement.idl
+ html/MediaController.idl
+ html/MediaError.idl
+ html/TimeRanges.idl
+ html/ValidityState.idl
</ins><span class="cx">
</span><del>- loader/appcache/DOMApplicationCache.idl
</del><ins>+ loader/appcache/DOMApplicationCache.idl
</ins><span class="cx">
</span><del>- page/BarProp.idl
- page/Console.idl
- page/DOMSecurityPolicy.idl
- page/DOMSelection.idl
- page/DOMWindow.idl
- page/History.idl
- page/Location.idl
- page/Navigator.idl
- page/Performance.idl
- page/PerformanceEntry.idl
- page/PerformanceEntryList.idl
- page/PerformanceNavigation.idl
- page/PerformanceTiming.idl
- page/Screen.idl
- page/WebKitPoint.idl
</del><ins>+ page/BarProp.idl
+ page/Console.idl
+ page/DOMSecurityPolicy.idl
+ page/DOMSelection.idl
+ page/DOMWindow.idl
+ page/History.idl
+ page/Location.idl
+ page/Navigator.idl
+ page/Performance.idl
+ page/PerformanceEntry.idl
+ page/PerformanceEntryList.idl
+ page/PerformanceNavigation.idl
+ page/PerformanceTiming.idl
+ page/Screen.idl
+ page/WebKitPoint.idl
</ins><span class="cx">
</span><del>- plugins/DOMMimeType.idl
- plugins/DOMMimeTypeArray.idl
- plugins/DOMPlugin.idl
- plugins/DOMPluginArray.idl
</del><ins>+ plugins/DOMMimeType.idl
+ plugins/DOMMimeTypeArray.idl
+ plugins/DOMPlugin.idl
+ plugins/DOMPluginArray.idl
</ins><span class="cx">
</span><del>- storage/Storage.idl
</del><ins>+ storage/Storage.idl
</ins><span class="cx">
</span><del>- xml/XPathExpression.idl
- xml/XPathNSResolver.idl
- xml/XPathResult.idl
- )
</del><ins>+ xml/XPathExpression.idl
+ xml/XPathNSResolver.idl
+ xml/XPathResult.idl
+)
</ins><span class="cx">
</span><del>- if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
- list(APPEND GObjectDOMBindings_IDL_FILES
- html/HTMLAudioElement.idl
- html/HTMLVideoElement.idl
</del><ins>+if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
+ list(APPEND GObjectDOMBindings_IDL_FILES
+ html/HTMLAudioElement.idl
+ html/HTMLVideoElement.idl
</ins><span class="cx">
</span><del>- html/track/AudioTrack.idl
- html/track/AudioTrackList.idl
- html/track/TextTrack.idl
- html/track/TextTrackCue.idl
- html/track/TextTrackCueList.idl
- html/track/TextTrackList.idl
- html/track/TrackEvent.idl
- html/track/VideoTrack.idl
- html/track/VideoTrackList.idl
- )
- endif ()
-
- set(GObjectDOMBindings_CLASS_LIST Custom EventTarget Object Deprecated)
- set(GObjectDOMBindings_INSTALLED_HEADERS
- ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
- ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
- ${WEBCORE_DIR}/bindings/gobject/WebKitDOMCustom.h
- ${WEBCORE_DIR}/bindings/gobject/WebKitDOMDeprecated.h
- ${WEBCORE_DIR}/bindings/gobject/WebKitDOMEventTarget.h
- ${WEBCORE_DIR}/bindings/gobject/WebKitDOMObject.h
</del><ins>+ html/track/AudioTrack.idl
+ html/track/AudioTrackList.idl
+ html/track/TextTrack.idl
+ html/track/TextTrackCue.idl
+ html/track/TextTrackCueList.idl
+ html/track/TextTrackList.idl
+ html/track/TrackEvent.idl
+ html/track/VideoTrack.idl
+ html/track/VideoTrackList.idl
</ins><span class="cx"> )
</span><del>- file(GLOB GObjectDOMBindingsSymbolsFiles
- "${WEBCORE_DIR}/bindings/gobject/WebKitDOM*.symbols"
- )
</del><ins>+endif ()
</ins><span class="cx">
</span><del>- foreach (file ${GObjectDOMBindings_IDL_FILES})
- get_filename_component(classname ${file} NAME_WE)
- list(APPEND GObjectDOMBindings_CLASS_LIST ${classname})
- list(APPEND GObjectDOMBindings_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.h)
- list(APPEND GObjectDOMBindingsSymbolsFiles ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.symbols)
- endforeach ()
</del><ins>+set(GObjectDOMBindings_CLASS_LIST Custom EventTarget Object Deprecated)
+set(GObjectDOMBindings_INSTALLED_HEADERS
+ ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
+ ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
+ ${WEBCORE_DIR}/bindings/gobject/WebKitDOMCustom.h
+ ${WEBCORE_DIR}/bindings/gobject/WebKitDOMDeprecated.h
+ ${WEBCORE_DIR}/bindings/gobject/WebKitDOMEventTarget.h
+ ${WEBCORE_DIR}/bindings/gobject/WebKitDOMObject.h
+)
+file(GLOB GObjectDOMBindingsSymbolsFiles
+ "${WEBCORE_DIR}/bindings/gobject/WebKitDOM*.symbols"
+)
</ins><span class="cx">
</span><del>- set(GOBJECT_DOM_BINDINGS_FEATURES_DEFINES "LANGUAGE_GOBJECT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
- string(REPLACE "ENABLE_INDEXED_DATABASE=1" "" GOBJECT_DOM_BINDINGS_FEATURES_DEFINES ${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES})
- string(REPLACE REGEX "ENABLE_SVG[A-Z_]+=1" "" GOBJECT_DOM_BINDINGS_FEATURES_DEFINES ${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES})
</del><ins>+foreach (file ${GObjectDOMBindings_IDL_FILES})
+ get_filename_component(classname ${file} NAME_WE)
+ list(APPEND GObjectDOMBindings_CLASS_LIST ${classname})
+ list(APPEND GObjectDOMBindings_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.h)
+ list(APPEND GObjectDOMBindingsSymbolsFiles ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.symbols)
+endforeach ()
</ins><span class="cx">
</span><del>- file(MAKE_DIRECTORY ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR})
</del><ins>+set(GOBJECT_DOM_BINDINGS_FEATURES_DEFINES "LANGUAGE_GOBJECT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
+string(REPLACE "ENABLE_INDEXED_DATABASE=1" "" GOBJECT_DOM_BINDINGS_FEATURES_DEFINES ${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES})
+string(REPLACE REGEX "ENABLE_SVG[A-Z_]+=1" "" GOBJECT_DOM_BINDINGS_FEATURES_DEFINES ${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES})
</ins><span class="cx">
</span><del>- add_custom_command(
- OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
- COMMAND echo ${GObjectDOMBindings_CLASS_LIST} | ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl defines > ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
- )
</del><ins>+file(MAKE_DIRECTORY ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR})
</ins><span class="cx">
</span><del>- add_custom_command(
- OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
- COMMAND echo ${GObjectDOMBindings_CLASS_LIST} | ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl gdom > ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
- )
</del><ins>+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
+ COMMAND echo ${GObjectDOMBindings_CLASS_LIST} | ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl defines > ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
+)
</ins><span class="cx">
</span><del>- add_custom_target(fake-installed-webkitdom-headers
- COMMAND ln -n -s -f ${WEBCORE_DIR}/bindings/gobject/*.h ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
- )
</del><ins>+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
+ COMMAND echo ${GObjectDOMBindings_CLASS_LIST} | ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl gdom > ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
+)
</ins><span class="cx">
</span><del>- GENERATE_BINDINGS(GObjectDOMBindings_SOURCES
- "${GObjectDOMBindings_IDL_FILES}"
- "${WEBCORE_DIR}"
- "${IDL_INCLUDES}"
- "${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES}"
- ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
- WebKitDOM GObject
- ${IDL_ATTRIBUTES_FILE}
- ${SUPPLEMENTAL_DEPENDENCY_FILE}
- ${WINDOW_CONSTRUCTORS_FILE}
- ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
</del><ins>+add_custom_target(fake-installed-webkitdom-headers
+ COMMAND ln -n -s -f ${WEBCORE_DIR}/bindings/gobject/*.h ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
+)
</ins><span class="cx">
</span><del>- add_definitions(-DBUILDING_WEBKIT)
</del><ins>+GENERATE_BINDINGS(GObjectDOMBindings_SOURCES
+ "${GObjectDOMBindings_IDL_FILES}"
+ "${WEBCORE_DIR}"
+ "${IDL_INCLUDES}"
+ "${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES}"
+ ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
+ WebKitDOM GObject
+ ${IDL_ATTRIBUTES_FILE}
+ ${SUPPLEMENTAL_DEPENDENCY_FILE}
+ ${WINDOW_CONSTRUCTORS_FILE}
+ ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
</ins><span class="cx">
</span><del>- add_library(GObjectDOMBindings STATIC ${GObjectDOMBindings_SOURCES})
</del><ins>+add_definitions(-DBUILDING_WEBKIT)
</ins><span class="cx">
</span><del>- WEBKIT_SET_EXTRA_COMPILER_FLAGS(GObjectDOMBindings)
</del><ins>+add_library(GObjectDOMBindings STATIC ${GObjectDOMBindings_SOURCES})
</ins><span class="cx">
</span><del>- add_dependencies(GObjectDOMBindings
- WebCore
- fake-installed-webkitdom-headers
- )
</del><ins>+WEBKIT_SET_EXTRA_COMPILER_FLAGS(GObjectDOMBindings)
</ins><span class="cx">
</span><del>- file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkitdom.cfg
- "[webkitdomgtk]\n"
- "pkgconfig_file=${WebKit2_PKGCONFIG_FILE}\n"
- "namespace=webkit_dom\n"
- "cflags=-I${CMAKE_SOURCE_DIR}/Source\n"
- " -I${WEBCORE_DIR}/bindings\n"
- " -I${WEBCORE_DIR}/bindings/gobject\n"
- " -I${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}\n"
- "doc_dir=${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/docs\n"
- "source_dirs=${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}\n"
- " ${WEBCORE_DIR}/bindings/gobject\n"
- "headers=${GObjectDOMBindings_INSTALLED_HEADERS}\n"
- )
</del><ins>+add_dependencies(GObjectDOMBindings
+ WebCore
+ fake-installed-webkitdom-headers
+)
</ins><span class="cx">
</span><del>- install(FILES ${GObjectDOMBindings_INSTALLED_HEADERS}
- DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom"
- )
</del><ins>+file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkitdom.cfg
+ "[webkitdomgtk]\n"
+ "pkgconfig_file=${WebKit2_PKGCONFIG_FILE}\n"
+ "namespace=webkit_dom\n"
+ "cflags=-I${CMAKE_SOURCE_DIR}/Source\n"
+ " -I${WEBCORE_DIR}/bindings\n"
+ " -I${WEBCORE_DIR}/bindings/gobject\n"
+ " -I${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}\n"
+ "doc_dir=${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/docs\n"
+ "source_dirs=${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}\n"
+ " ${WEBCORE_DIR}/bindings/gobject\n"
+ "headers=${GObjectDOMBindings_INSTALLED_HEADERS}\n"
+)
</ins><span class="cx">
</span><del>- # Some installed headers are not on the list of headers used for gir generation.
- set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindings_INSTALLED_HEADERS})
- list(REMOVE_ITEM GObjectDOMBindings_GIR_HEADERS
- bindings/gobject/WebKitDOMEventTarget.h
- bindings/gobject/WebKitDOMDeprecated.h
- bindings/gobject/WebKitDOMObject.h)
</del><ins>+install(FILES ${GObjectDOMBindings_INSTALLED_HEADERS}
+ DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom"
+)
</ins><span class="cx">
</span><del>- # Propagate this variable to the parent scope, so that it can be used in other parts of the build.
- set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindings_GIR_HEADERS} PARENT_SCOPE)
</del><ins>+# Some installed headers are not on the list of headers used for gir generation.
+set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindings_INSTALLED_HEADERS})
+list(REMOVE_ITEM GObjectDOMBindings_GIR_HEADERS
+ bindings/gobject/WebKitDOMDeprecated.h
+ bindings/gobject/WebKitDOMEventTarget.h
+ bindings/gobject/WebKitDOMObject.h
+)
</ins><span class="cx">
</span><del>-endif ()
-
</del><ins>+# Propagate this variable to the parent scope, so that it can be used in other parts of the build.
+set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindings_GIR_HEADERS} PARENT_SCOPE)
</ins></span></pre>
</div>
</div>
</body>
</html>