<!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>[198766] 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/198766">198766</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-03-28 17:19:05 -0700 (Mon, 28 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Ninja build on Mac
https://bugs.webkit.org/show_bug.cgi?id=151399
Reviewed by Darin Adler.
.:
* Source/CMakeLists.txt:
* Source/cmake/WebKitMacros.cmake:
Source/WebCore:
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
This moves WebCoreDerivedSources to a separate static library to reduce linker command
line lengths when using ninja on mac. This also helps Windows builds, which sometimes
regenerate everything every time you build; now you'll be able to just build WebCore
and WebKit without all the WebCoreDerivedSources stuff.
Source/WebKit:
* PlatformWin.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceCMakeListstxt">trunk/Source/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreWebCoreDerivedSourcesPrefixcpp">trunk/Source/WebCore/WebCoreDerivedSourcesPrefix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (198765 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-03-29 00:08:23 UTC (rev 198765)
+++ trunk/ChangeLog 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-28 Alex Christensen <achristensen@webkit.org>
+
+ Fix Ninja build on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=151399
+
+ Reviewed by Darin Adler.
+
+ * Source/CMakeLists.txt:
+ * Source/cmake/WebKitMacros.cmake:
+
</ins><span class="cx"> 2016-03-27 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit.xcworkspace "All Source" scheme always copies OS X WebKitSystemInterface libraries
</span></span></pre></div>
<a id="trunkSourceCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/CMakeLists.txt (198765 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/CMakeLists.txt 2016-03-29 00:08:23 UTC (rev 198765)
+++ trunk/Source/CMakeLists.txt 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> if (ENABLE_WEBCORE)
</span><span class="cx"> WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreTestSupport ${ADDITIONAL_COMPILER_FLAGS})
</span><span class="cx"> WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCore ${ADDITIONAL_COMPILER_FLAGS})
</span><ins>+ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreDerivedSources ${ADDITIONAL_COMPILER_FLAGS})
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBKIT)
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (198765 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-03-29 00:08:23 UTC (rev 198765)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -3455,7 +3455,7 @@
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/inline-and-minify-stylesheets-and-scripts.py ${WEBCORE_DIR}/inspector/InspectorOverlayPage.html ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.combined.html
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl InspectorOverlayPage_html ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.combined.html ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.h
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.h)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.h)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Generate CommandLineAPIModuleSource.h
</span><span class="lines">@@ -3467,11 +3467,11 @@
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBCORE_DIR}/inspector/CommandLineAPIModuleSource.js >> ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl CommandLineAPIModuleSource_js ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.min.js ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> MAKE_HASH_TOOLS(${WEBCORE_DIR}/platform/ColorData)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/ColorData.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/ColorData.cpp)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Generate XMLViewerCSS.h
</span><span class="lines">@@ -3482,9 +3482,8 @@
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/cssmin.py < ${WEBCORE_DIR}/xml/XMLViewer.css > ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.css
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl XMLViewer_css ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.css ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h)
</ins><span class="cx">
</span><del>-
</del><span class="cx"> # Generate XMLViewerJS.h
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.js
</span><span class="lines">@@ -3493,9 +3492,8 @@
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${WEBCORE_DIR}/xml/XMLViewer.js > ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.js
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl XMLViewer_js ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewer.min.js ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerJS.h)
</ins><span class="cx">
</span><del>-
</del><span class="cx"> # Generate HTML entity table
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp
</span><span class="lines">@@ -3503,7 +3501,7 @@
</span><span class="cx"> DEPENDS ${WEBCORE_DIR}/html/parser/create-html-entity-table
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/html/parser/create-html-entity-table -o ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLEntityTable.cpp)
</ins><span class="cx">
</span><span class="cx"> # Generate HTTP header names
</span><span class="cx"> add_custom_command(
</span><span class="lines">@@ -3513,7 +3511,7 @@
</span><span class="cx"> WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/platform/network/create-http-header-name-table ${WEBCORE_DIR}/platform/network/HTTPHeaderNames.in "${GPERF_EXECUTABLE}"
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTTPHeaderNames.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTTPHeaderNames.cpp)
</ins><span class="cx">
</span><span class="cx"> # Generate CSS property names
</span><span class="cx"> add_custom_command(
</span><span class="lines">@@ -3524,13 +3522,12 @@
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --gperf-executable "${GPERF_EXECUTABLE}"
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp)
-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp)
-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StylePropertyShorthandFunctions.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp)
+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp)
+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StylePropertyShorthandFunctions.cpp)
</ins><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSPropertyNames.h)
</span><span class="cx">
</span><del>-
</del><span class="cx"> # Generate CSS value keywords
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.gperf
</span><span class="lines">@@ -3540,7 +3537,7 @@
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp)
</ins><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSValueKeywords.h)
</span><span class="lines">@@ -3552,14 +3549,14 @@
</span><span class="cx"> WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/css/makeSelectorPseudoClassAndCompatibilityElementMap.py ${WEBCORE_DIR}/css/SelectorPseudoClassAndCompatibilityElementMap.in "${GPERF_EXECUTABLE}" "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoClassAndCompatibilityElementMap.cpp)
</ins><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.gperf ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.cpp
</span><span class="cx"> MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeSelectorPseudoElementsMap.py
</span><span class="cx"> WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/css/makeSelectorPseudoElementsMap.py ${WEBCORE_DIR}/css/SelectorPseudoElementTypeMap.in "${GPERF_EXECUTABLE}" "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SelectorPseudoElementTypeMap.cpp)
</ins><span class="cx">
</span><span class="cx"> # Generate user agent styles
</span><span class="cx"> add_custom_command(
</span><span class="lines">@@ -3568,7 +3565,7 @@
</span><span class="cx"> DEPENDS ${WebCore_USER_AGENT_STYLE_SHEETS} ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS}
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp)
</ins><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
</span><span class="cx">
</span><span class="cx"> if (WebCore_USER_AGENT_SCRIPTS)
</span><span class="lines">@@ -3583,7 +3580,7 @@
</span><span class="cx"> DEPENDS ${WebCore_USER_AGENT_SCRIPTS}
</span><span class="cx"> COMMAND "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}" ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/Scripts/make-js-file-arrays.py ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScriptsData.cpp ${WebCore_USER_AGENT_SCRIPTS}
</span><span class="cx"> VERBATIM)
</span><del>- list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScriptsData.cpp)
</del><ins>+ list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScriptsData.cpp)
</ins><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES} UserAgentScriptsData.cpp UserAgentScripts.h)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="lines">@@ -3599,7 +3596,7 @@
</span><span class="cx"> DEPENDS ${WebCore_SDP_PROCESSOR_SCRIPTS}
</span><span class="cx"> COMMAND "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}" ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/Scripts/make-js-file-arrays.py ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScripts.h ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScriptsData.cpp ${WebCore_SDP_PROCESSOR_SCRIPTS}
</span><span class="cx"> VERBATIM)
</span><del>- list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScriptsData.cpp)
</del><ins>+ list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScriptsData.cpp)
</ins><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES} SDPProcessorScriptsData.cpp SDPProcessorScripts.h)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="lines">@@ -3610,14 +3607,14 @@
</span><span class="cx"> DEPENDS ${WebCore_PLUG_INS_RESOURCES} ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResources.h ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp ${WebCore_PLUG_INS_RESOURCES}
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp)
</ins><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp PlugInsResourcesData.cpp PlugInsResources.h)
</span><span class="cx">
</span><span class="cx"> GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp)
</ins><span class="cx">
</span><span class="cx"> GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp "")
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> set(IDL_INCLUDES "")
</span><span class="lines">@@ -3663,7 +3660,7 @@
</span><span class="cx"> ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-GENERATE_BINDINGS(WebCore_SOURCES
</del><ins>+GENERATE_BINDINGS(WebCore_DERIVED_SOURCES
</ins><span class="cx"> "${WebCore_IDL_FILES}"
</span><span class="cx"> "${WEBCORE_DIR}"
</span><span class="cx"> "${IDL_INCLUDES}"
</span><span class="lines">@@ -3725,7 +3722,7 @@
</span><span class="cx"> DEPENDS ${BUILTINS_GENERATOR_SCRIPTS}
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework WebCore --output-directory ${DERIVED_SOURCES_WEBCORE_DIR} ${_builtinSource}
</span><span class="cx"> VERBATIM)
</span><del>- list(APPEND WebCore_SOURCES
</del><ins>+ list(APPEND WebCore_DERIVED_SOURCES
</ins><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h
</span><span class="cx"> )
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/bindings/js/WebCoreJSBuiltins.cpp ${_objectName}Builtins.cpp)
</span><span class="lines">@@ -3736,21 +3733,21 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> GENERATE_DOM_NAMES(HTML ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/html/HTMLTagNames.in "")
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSHTMLElementWrapperFactory.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSHTMLElementWrapperFactory.cpp)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> GENERATE_EVENT_FACTORY(${WEBCORE_DIR}/dom/EventNames.in EventInterfaces.h)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/EventInterfaces.h)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/EventInterfaces.h)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> GENERATE_EVENT_FACTORY(${WEBCORE_DIR}/dom/EventTargetFactory.in EventTargetInterfaces.h)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/dom/EventNames.cpp EventTargetInterfaces.h)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/dom/DOMAllInOne.cpp EventTargetInterfaces.h)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/EventTargetInterfaces.h)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/EventTargetInterfaces.h)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> GENERATE_EXCEPTION_CODE_DESCRIPTION(${WEBCORE_DIR}/dom/DOMExceptions.in ExceptionCodeDescription.cpp)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/ExceptionCodeDescription.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/ExceptionCodeDescription.cpp)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> GENERATE_SETTINGS_MACROS(${WEBCORE_DIR}/page/Settings.in SettingsMacros.h)
</span><span class="lines">@@ -3758,13 +3755,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> GENERATE_FONT_NAMES(${WEBCORE_DIR}/css/WebKitFontFamilyNames.in)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitFontFamilyNames.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitFontFamilyNames.cpp)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> GENERATE_DOM_NAMES(MathML ${WEBCORE_DIR}/mathml/mathattrs.in ${WEBCORE_DIR}/mathml/mathtags.in "")
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLNames.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLNames.cpp)
</ins><span class="cx"> if (ENABLE_MATHML)
</span><del>- list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLElementFactory.cpp)
</del><ins>+ list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLElementFactory.cpp)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> # SVG extra defines need to map to a numerical value for correct preprocessing of svgtags.in.
</span><span class="lines">@@ -3774,35 +3771,44 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in "${SVG_EXTRA_DEFINES}")
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGNames.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGNames.cpp)
</ins><span class="cx">
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSSVGElementWrapperFactory.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSSVGElementWrapperFactory.cpp)
</ins><span class="cx">
</span><span class="cx"> GENERATE_DOM_NAMES(XLink ${WEBCORE_DIR}/svg/xlinkattrs.in)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XLinkNames.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XLinkNames.cpp)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> GENERATE_DOM_NAMES(XMLNS ${WEBCORE_DIR}/xml/xmlnsattrs.in)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNSNames.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNSNames.cpp)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp)
</ins><span class="cx">
</span><span class="cx"> if (ENABLE_ALLINONE_BUILD)
</span><span class="cx"> message(STATUS "All-in-One DerivedSources build is enabled.")
</span><span class="cx"> PROCESS_ALLINONE_FILE("${WebCore_SOURCES}" DerivedSources.cpp newSources TRUE)
</span><span class="cx"> set(WebCore_SOURCES DerivedSources.cpp ${newSources})
</span><del>- list(APPEND WebCore_SOURCES DerivedSources.cpp)
</del><ins>+ list(APPEND WebCore_DERIVED_SOURCES DerivedSources.cpp)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><del>-WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
</del><ins>+WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_DERIVED_SOURCES})
</ins><span class="cx"> WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
</span><span class="cx">
</span><span class="cx"> if (MSVC)
</span><span class="cx"> ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
</span><ins>+ ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCoreDerivedSourcesPrefix.cpp" WebCore_DERIVED_SOURCES)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+# This is split into a separate library as a workaround for command line length
+# limits. This should no longer be needed when CMake supports Ninja response
+# files on OS X.
+add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
+set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
+set_target_properties(WebCoreDerivedSources PROPERTIES FOLDER "WebCore")
+list(APPEND WebCore_LIBRARIES WebCoreDerivedSources${DEBUG_SUFFIX})
+
</ins><span class="cx"> WEBKIT_FRAMEWORK(WebCore)
</span><span class="cx">
</span><span class="cx"> # The -ftree-sra optimization (implicit with -O2) causes crashes when
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198765 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-29 00:08:23 UTC (rev 198765)
+++ trunk/Source/WebCore/ChangeLog 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-28 Alex Christensen <achristensen@webkit.org>
+
+ Fix Ninja build on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=151399
+
+ Reviewed by Darin Adler.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ This moves WebCoreDerivedSources to a separate static library to reduce linker command
+ line lengths when using ninja on mac. This also helps Windows builds, which sometimes
+ regenerate everything every time you build; now you'll be able to just build WebCore
+ and WebKit without all the WebCoreDerivedSources stuff.
+
</ins><span class="cx"> 2016-03-28 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build on some stricter compilers by removing unnecessary WTFMove.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (198765 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2016-03-29 00:08:23 UTC (rev 198765)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (USE_GEOCLUE2)
</span><del>- list(APPEND WebCore_SOURCES
</del><ins>+ list(APPEND WebCore_DERIVED_SOURCES
</ins><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
</span><span class="cx"> )
</span><span class="cx"> execute_process(COMMAND pkg-config --variable dbus_interface geoclue-2.0 OUTPUT_VARIABLE GEOCLUE_DBUS_INTERFACE)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
</span><span class="cx"> VERBATIM)
</span><del>-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
</ins><span class="cx">
</span><span class="cx"> set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/efl/RenderThemeEfl.cpp)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (198765 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2016-03-29 00:08:23 UTC (rev 198765)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (USE_GEOCLUE2)
</span><del>- list(APPEND WebCore_SOURCES
</del><ins>+ list(APPEND WebCore_DERIVED_SOURCES
</ins><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
</span><span class="cx"> )
</span><span class="cx"> execute_process(COMMAND pkg-config --variable dbus_interface geoclue-2.0 OUTPUT_VARIABLE GEOCLUE_DBUS_INTERFACE)
</span><span class="lines">@@ -357,7 +357,8 @@
</span><span class="cx"> platform/graphics/wayland/PlatformDisplayWayland.cpp
</span><span class="cx"> platform/graphics/wayland/WaylandEventSource.cpp
</span><span class="cx"> platform/graphics/wayland/WaylandSurface.cpp
</span><del>-
</del><ins>+ )
+ list(APPEND WebCore_DERIVED_SOURCES
</ins><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandClientProtocol.c
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (198765 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2016-03-29 00:08:23 UTC (rev 198765)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/platform/text/mac/make-charset-table.pl ${WEBCORE_DIR}/platform/text/mac/character-sets.txt ${WEBCORE_DIR}/platform/text/mac/mac-encodings.txt kTextEncoding > ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp
</span><span class="cx"> VERBATIM)
</span><span class="cx">
</span><del>-list(APPEND WebCore_SOURCES
</del><ins>+list(APPEND WebCore_DERIVED_SOURCES
</ins><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -913,7 +913,7 @@
</span><span class="cx"> XPathNSResolver
</span><span class="cx"> )
</span><span class="cx">
</span><del>-GENERATE_BINDINGS(WebCore_SOURCES
</del><ins>+GENERATE_BINDINGS(WebCore_DERIVED_SOURCES
</ins><span class="cx"> "${ObjC_Bindings_IDL_FILES}"
</span><span class="cx"> "${WEBCORE_DIR}"
</span><span class="cx"> "${IDL_INCLUDES}"
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreDerivedSourcesPrefixcppfromrev198757trunkSourceWebCoreWebCorePrefixcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/WebCoreDerivedSourcesPrefix.cpp (from rev 198757, trunk/Source/WebCore/WebCorePrefix.cpp) (0 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCoreDerivedSourcesPrefix.cpp (rev 0)
+++ trunk/Source/WebCore/WebCoreDerivedSourcesPrefix.cpp 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+/*
+ * Copyright (C) 2007 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WebCorePrefix.h"
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (198765 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-03-29 00:08:23 UTC (rev 198765)
+++ trunk/Source/WebKit/ChangeLog 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-03-28 Alex Christensen <achristensen@webkit.org>
+
+ Fix Ninja build on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=151399
+
+ Reviewed by Darin Adler.
+
+ * PlatformWin.cmake:
+
</ins><span class="cx"> 2016-03-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Consolidate RuntimeApplicationChecks and RuntimeApplicationChecksIOS
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (198765 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2016-03-29 00:08:23 UTC (rev 198765)
+++ trunk/Source/WebKit/PlatformWin.cmake 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -421,6 +421,7 @@
</span><span class="cx"> PRIVATE Version
</span><span class="cx"> PRIVATE Winmm
</span><span class="cx"> PRIVATE WebKitGUID${DEBUG_SUFFIX}
</span><ins>+ PRIVATE WebCoreDerivedSources${DEBUG_SUFFIX}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (ENABLE_GRAPHICS_CONTEXT_3D)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (198765 => 198766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2016-03-29 00:08:23 UTC (rev 198765)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-03-29 00:19:05 UTC (rev 198766)
</span><span class="lines">@@ -26,7 +26,8 @@
</span><span class="cx"> macro(ADD_PRECOMPILED_HEADER _header _cpp _source)
</span><span class="cx"> if (MSVC)
</span><span class="cx"> get_filename_component(PrecompiledBasename ${_header} NAME_WE)
</span><del>- set(PrecompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${PrecompiledBasename}.pch")
</del><ins>+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${_source}")
+ set(PrecompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${_source}/${PrecompiledBasename}.pch")
</ins><span class="cx"> set(_sources ${${_source}})
</span><span class="cx">
</span><span class="cx"> set_source_files_properties(${_cpp}
</span></span></pre>
</div>
</div>
</body>
</html>