<!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>[208104] 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/208104">208104</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-29 09:03:25 -0700 (Sat, 29 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake][Win] Visual Studio invokes make_settings.pl twice
https://bugs.webkit.org/show_bug.cgi?id=163774
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2016-10-29
Reviewed by Michael Catanzaro.
build-webkit recompiles some files just after finishing
build-webkit in case of using CMake VisualStudio generator because
both WebCoreDerivedSources.vcxproj and WebCoreTestSupport.vcxproj
triggers make_settings.pl.
make_settings.pl generates four files
InternalSettingsGenerated.{h,cpp,idl} and SettingsMacros.h.
WebCoreDerivedSources depends on SettingsMacros.h, and
WebCoreTestSupport depends on InternalSettingsGenerated.cpp.
This problem is described in CMake documentation:
<https://cmake.org/cmake/help/v3.0/command/add_custom_command.html>
> Do not list the output in more than one independent target that may
> build in parallel or the two instances of the rule may conflict
To solve this problem, only SettingsMacros.h is specified as
OUTPUT of add_custom_command, and other generated files are marked
as BYPRODUCTS. As the result, only WebCoreDerivedSources target
triggers make_settings.pl. And other targets already have a
dependency to WebCoreDerivedSources target.
To support earlier versions than CMake 3.2, it uses GENERATED
source file property instead of BYPRODUCTS option.
* Source/cmake/WebKitMacros.cmake(GENERATE_SETTINGS_MACROS):
Removed extra output files from OUTPUT of add_custom_command and
added BYPRODUCTS option.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (208103 => 208104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-10-29 15:22:39 UTC (rev 208103)
+++ trunk/ChangeLog 2016-10-29 16:03:25 UTC (rev 208104)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-10-29 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ [CMake][Win] Visual Studio invokes make_settings.pl twice
+ https://bugs.webkit.org/show_bug.cgi?id=163774
+
+ Reviewed by Michael Catanzaro.
+
+ build-webkit recompiles some files just after finishing
+ build-webkit in case of using CMake VisualStudio generator because
+ both WebCoreDerivedSources.vcxproj and WebCoreTestSupport.vcxproj
+ triggers make_settings.pl.
+
+ make_settings.pl generates four files
+ InternalSettingsGenerated.{h,cpp,idl} and SettingsMacros.h.
+ WebCoreDerivedSources depends on SettingsMacros.h, and
+ WebCoreTestSupport depends on InternalSettingsGenerated.cpp.
+
+ This problem is described in CMake documentation:
+ <https://cmake.org/cmake/help/v3.0/command/add_custom_command.html>
+
+ > Do not list the output in more than one independent target that may
+ > build in parallel or the two instances of the rule may conflict
+
+ To solve this problem, only SettingsMacros.h is specified as
+ OUTPUT of add_custom_command, and other generated files are marked
+ as BYPRODUCTS. As the result, only WebCoreDerivedSources target
+ triggers make_settings.pl. And other targets already have a
+ dependency to WebCoreDerivedSources target.
+
+ To support earlier versions than CMake 3.2, it uses GENERATED
+ source file property instead of BYPRODUCTS option.
+
+ * Source/cmake/WebKitMacros.cmake(GENERATE_SETTINGS_MACROS):
+ Removed extra output files from OUTPUT of add_custom_command and
+ added BYPRODUCTS option.
+
</ins><span class="cx"> 2016-10-28 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Changing enabled features should trigger recompiling all IDL
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (208103 => 208104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2016-10-29 15:22:39 UTC (rev 208103)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-10-29 16:03:25 UTC (rev 208104)
</span><span class="lines">@@ -185,12 +185,25 @@
</span><span class="cx"> macro(GENERATE_SETTINGS_MACROS _infile _outfile)
</span><span class="cx"> set(NAMES_GENERATOR ${WEBCORE_DIR}/page/make_settings.pl)
</span><span class="cx">
</span><ins>+ # Do not list the output in more than one independent target that may
+ # build in parallel or the two instances of the rule may conflict.
+ # <https://cmake.org/cmake/help/v3.0/command/add_custom_command.html>
+ set(_extra_output
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.h
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl
+ )
+ set(_args BYPRODUCTS ${_extra_output})
+ if (${CMAKE_VERSION} VERSION_LESS 3.2)
+ set_source_files_properties(${_extra_output} PROPERTIES GENERATED 1)
+ set(_args)
+ endif ()
</ins><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_outfile} ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.h ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl
</del><ins>+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_outfile}
</ins><span class="cx"> MAIN_DEPENDENCY ${_infile}
</span><span class="cx"> DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --input ${_infile} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
</span><del>- VERBATIM)
</del><ins>+ VERBATIM ${_args})
</ins><span class="cx"> endmacro()
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>