<!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>[202056] 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/202056">202056</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-06-14 11:51:44 -0700 (Tue, 14 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/202020">r202020</a>): El Capitan CMake Debug build broken
<https://webkit.org/b/158743>
Reviewed by Alex Christensen.
The bug was that pure C++ source files (and Objective-C source
files) were being compiled as Objective-C++ source files. This
is obviously incorrect, so the fix was to split out the list of
source files by language, then define compiler switches based on
each file type.
* DumpRenderTree/PlatformMac.cmake: Replace add_definitions()
with separate foreach loops that set compiler flags based on
each source file's type.
(TestNetscapePlugin_ObjCpp_SOURCES): Rename from
TestNetscapePlugin_SOURCES.
(TestNetscapePlugin_SOURCES): Create based on
${TestNetscapePlugin_ObjCpp_SOURCES}.
(DumpRenderTree_ObjC_SOURCES): Split from DumpRenderTree_SOURCES.
(DumpRenderTree_Cpp_SOURCES): Ditto.
(DumpRenderTree_ObjCpp_SOURCES): Ditto.
(DumpRenderTree_SOURCES): Create from above three 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 (202055 => 202056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-14 18:42:17 UTC (rev 202055)
+++ trunk/Tools/ChangeLog 2016-06-14 18:51:44 UTC (rev 202056)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-06-14 David Kilzer <ddkilzer@apple.com>
+
+ REGRESSION (r202020): El Capitan CMake Debug build broken
+ <https://webkit.org/b/158743>
+
+ Reviewed by Alex Christensen.
+
+ The bug was that pure C++ source files (and Objective-C source
+ files) were being compiled as Objective-C++ source files. This
+ is obviously incorrect, so the fix was to split out the list of
+ source files by language, then define compiler switches based on
+ each file type.
+
+ * DumpRenderTree/PlatformMac.cmake: Replace add_definitions()
+ with separate foreach loops that set compiler flags based on
+ each source file's type.
+ (TestNetscapePlugin_ObjCpp_SOURCES): Rename from
+ TestNetscapePlugin_SOURCES.
+ (TestNetscapePlugin_SOURCES): Create based on
+ ${TestNetscapePlugin_ObjCpp_SOURCES}.
+ (DumpRenderTree_ObjC_SOURCES): Split from DumpRenderTree_SOURCES.
+ (DumpRenderTree_Cpp_SOURCES): Ditto.
+ (DumpRenderTree_ObjCpp_SOURCES): Ditto.
+ (DumpRenderTree_SOURCES): Create from above three lists.
+
</ins><span class="cx"> 2016-06-14 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/26685782>
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (202055 => 202056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-06-14 18:42:17 UTC (rev 202055)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-06-14 18:51:44 UTC (rev 202056)
</span><span class="lines">@@ -24,8 +24,6 @@
</span><span class="cx"> WebKit2
</span><span class="cx"> )
</span><span class="cx">
</span><del>-add_definitions("-ObjC++ -std=c++11")
-
</del><span class="cx"> if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
</span><span class="cx"> set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
</span><span class="cx"> elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
</span><span class="lines">@@ -49,31 +47,42 @@
</span><span class="cx"> ${WTF_DIR}/icu
</span><span class="cx"> )
</span><span class="cx">
</span><del>-list(APPEND TestNetscapePlugin_SOURCES
</del><ins>+list(APPEND TestNetscapePlugin_ObjCpp_SOURCES
</ins><span class="cx"> TestNetscapePlugIn/PluginObjectMac.mm
</span><span class="cx"> )
</span><span class="cx">
</span><del>-list(APPEND DumpRenderTree_SOURCES
</del><ins>+set(TestNetscapePlugin_SOURCES ${TestNetscapePlugin_ObjCpp_SOURCES})
+
+list(APPEND DumpRenderTree_ObjC_SOURCES
</ins><span class="cx"> DefaultPolicyDelegate.m
</span><span class="cx"> DumpRenderTreeFileDraggingSource.m
</span><span class="cx">
</span><ins>+ mac/AppleScriptController.m
+ mac/DumpRenderTreePasteboard.m
+ mac/NavigationController.m
+ mac/ObjCController.m
+ mac/ObjCPlugin.m
+ mac/ObjCPluginFunction.m
+ mac/TextInputController.m
+)
+
+list(APPEND DumpRenderTree_Cpp_SOURCES
</ins><span class="cx"> cf/WebArchiveDumpSupport.cpp
</span><span class="cx">
</span><span class="cx"> cg/PixelDumpSupportCG.cpp
</span><span class="cx">
</span><del>- mac/AccessibilityCommonMac.h
</del><ins>+ mac/CheckedMalloc.cpp
+)
+
+list(APPEND DumpRenderTree_ObjCpp_SOURCES
</ins><span class="cx"> mac/AccessibilityCommonMac.mm
</span><span class="cx"> mac/AccessibilityControllerMac.mm
</span><del>- mac/AccessibilityNotificationHandler.h
</del><span class="cx"> mac/AccessibilityNotificationHandler.mm
</span><span class="cx"> mac/AccessibilityTextMarkerMac.mm
</span><span class="cx"> mac/AccessibilityUIElementMac.mm
</span><del>- mac/AppleScriptController.m
- mac/CheckedMalloc.cpp
</del><span class="cx"> mac/DumpRenderTree.mm
</span><span class="cx"> mac/DumpRenderTreeDraggingInfo.mm
</span><span class="cx"> mac/DumpRenderTreeMain.mm
</span><del>- mac/DumpRenderTreePasteboard.m
</del><span class="cx"> mac/DumpRenderTreeWindow.mm
</span><span class="cx"> mac/EditingDelegate.mm
</span><span class="cx"> mac/EventSendingController.mm
</span><span class="lines">@@ -82,20 +91,29 @@
</span><span class="cx"> mac/HistoryDelegate.mm
</span><span class="cx"> mac/MockGeolocationProvider.mm
</span><span class="cx"> mac/MockWebNotificationProvider.mm
</span><del>- mac/NavigationController.m
- mac/ObjCController.m
- mac/ObjCPlugin.m
- mac/ObjCPluginFunction.m
</del><span class="cx"> mac/PixelDumpSupportMac.mm
</span><span class="cx"> mac/PolicyDelegate.mm
</span><span class="cx"> mac/ResourceLoadDelegate.mm
</span><span class="cx"> mac/TestRunnerMac.mm
</span><del>- mac/TextInputController.m
</del><span class="cx"> mac/UIDelegate.mm
</span><span class="cx"> mac/WebArchiveDumpSupportMac.mm
</span><span class="cx"> mac/WorkQueueItemMac.mm
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+set(DumpRenderTree_SOURCES ${DumpRenderTree_ObjC_SOURCES} ${DumpRenderTree_ObjCpp_SOURCES} ${DumpRenderTree_Cpp_Sources})
+
+foreach (_file ${DumpRenderTree_ObjC_SOURCES})
+ set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c99")
+endforeach ()
+
+foreach (_file ${DumpRenderTree_Cpp_SOURCES})
+ set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c++14")
+endforeach ()
+
+foreach (_file ${DumpRenderTree_ObjCpp_SOURCES} ${TestNetscapePlugin_ObjCpp_SOURCES})
+ set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++14")
+endforeach ()
+
</ins><span class="cx"> set(DumpRenderTree_RESOURCES
</span><span class="cx"> AHEM____.TTF
</span><span class="cx"> FontWithFeatures.otf
</span></span></pre>
</div>
</div>
</body>
</html>