<!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>[202060] trunk/Tools</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/202060">202060</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-06-14 13:17:10 -0700 (Tue, 14 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Follow-up fix: REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/202020">r202020</a>): El Capitan CMake Debug build broken
<https://webkit.org/b/158743>
Unreviewed build fix.
The fix in <a href="http://trac.webkit.org/projects/webkit/changeset/202056">r202056</a> clobbered DumpRenderTree_SOURCES and
TestNetscapePlugin_SOURCES from DumpRenderTree/CMakeLists.txt,
so the build failure is now that we're not building the common
sources.
Fix that by saving the common sources (which are all C++ source
files) into *_Cpp_SOURCES lists first, then setting the compiler
flags, then creating the final *_SOURCES lists.
* DumpRenderTree/PlatformMac.cmake: Add
${TestNetscapePlugin_Cpp_SOURCES} to list that needs
"-std=c++14" compiler switch.
(TestNetscapePlugin_Cpp_SOURCES): Add new list for C++ source
files for TestNetscapePlugin. Seeded with
${TestNetscapePlugin_SOURCES} from CMakeLists.txt.
(TestNetscapePlugin_SOURCES): Add
${TestNetscapePlugin_Cpp_SOURCES} to the list of files.
(DumpRenderTree_Cpp_SOURCES): Seed list for C++ source files
with ${DumpRenderTree_SOURCES} from CMakeLists.txt.
(DumpRenderTree_SOURCES): Reformat and sort source lists.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformMaccmake">trunk/Tools/DumpRenderTree/PlatformMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202059 => 202060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-14 20:15:47 UTC (rev 202059)
+++ trunk/Tools/ChangeLog 2016-06-14 20:17:10 UTC (rev 202060)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-06-14 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><ins>+ Follow-up fix: REGRESSION (r202020): El Capitan CMake Debug build broken
+ <https://webkit.org/b/158743>
+
+ Unreviewed build fix.
+
+ The fix in r202056 clobbered DumpRenderTree_SOURCES and
+ TestNetscapePlugin_SOURCES from DumpRenderTree/CMakeLists.txt,
+ so the build failure is now that we're not building the common
+ sources.
+
+ Fix that by saving the common sources (which are all C++ source
+ files) into *_Cpp_SOURCES lists first, then setting the compiler
+ flags, then creating the final *_SOURCES lists.
+
+ * DumpRenderTree/PlatformMac.cmake: Add
+ ${TestNetscapePlugin_Cpp_SOURCES} to list that needs
+ "-std=c++14" compiler switch.
+ (TestNetscapePlugin_Cpp_SOURCES): Add new list for C++ source
+ files for TestNetscapePlugin. Seeded with
+ ${TestNetscapePlugin_SOURCES} from CMakeLists.txt.
+ (TestNetscapePlugin_SOURCES): Add
+ ${TestNetscapePlugin_Cpp_SOURCES} to the list of files.
+ (DumpRenderTree_Cpp_SOURCES): Seed list for C++ source files
+ with ${DumpRenderTree_SOURCES} from CMakeLists.txt.
+ (DumpRenderTree_SOURCES): Reformat and sort source lists.
+
+2016-06-14 David Kilzer <ddkilzer@apple.com>
+
</ins><span class="cx"> REGRESSION (r202020): El Capitan CMake Debug build broken
</span><span class="cx"> <https://webkit.org/b/158743>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (202059 => 202060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-06-14 20:15:47 UTC (rev 202059)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-06-14 20:17:10 UTC (rev 202060)
</span><span class="lines">@@ -47,12 +47,25 @@
</span><span class="cx"> ${WTF_DIR}/icu
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+# Common ${TestNetscapePlugin_SOURCES} from CMakeLists.txt are C++ source files.
+list(APPEND TestNetscapePlugin_Cpp_SOURCES
+ ${TestNetscapePlugin_SOURCES}
+)
+
</ins><span class="cx"> list(APPEND TestNetscapePlugin_ObjCpp_SOURCES
</span><span class="cx"> TestNetscapePlugIn/PluginObjectMac.mm
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(TestNetscapePlugin_SOURCES ${TestNetscapePlugin_ObjCpp_SOURCES})
</del><ins>+set(TestNetscapePlugin_SOURCES
+ ${TestNetscapePlugin_Cpp_SOURCES}
+ ${TestNetscapePlugin_ObjCpp_SOURCES}
+)
</ins><span class="cx">
</span><ins>+# Common ${DumpRenderTree_SOURCES} from CMakeLists.txt are C++ source files.
+list(APPEND DumpRenderTree_Cpp_SOURCES
+ ${DumpRenderTree_SOURCES}
+)
+
</ins><span class="cx"> list(APPEND DumpRenderTree_ObjC_SOURCES
</span><span class="cx"> DefaultPolicyDelegate.m
</span><span class="cx"> DumpRenderTreeFileDraggingSource.m
</span><span class="lines">@@ -100,13 +113,17 @@
</span><span class="cx"> mac/WorkQueueItemMac.mm
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(DumpRenderTree_SOURCES ${DumpRenderTree_ObjC_SOURCES} ${DumpRenderTree_ObjCpp_SOURCES} ${DumpRenderTree_Cpp_Sources})
</del><ins>+set(DumpRenderTree_SOURCES
+ ${DumpRenderTree_Cpp_Sources}
+ ${DumpRenderTree_ObjC_SOURCES}
+ ${DumpRenderTree_ObjCpp_SOURCES}
+)
</ins><span class="cx">
</span><span class="cx"> foreach (_file ${DumpRenderTree_ObjC_SOURCES})
</span><span class="cx"> set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c99")
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span><del>-foreach (_file ${DumpRenderTree_Cpp_SOURCES})
</del><ins>+foreach (_file ${DumpRenderTree_Cpp_SOURCES} ${TestNetscapePlugin_Cpp_SOURCES})
</ins><span class="cx"> set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c++14")
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>