<!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>[189076] 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/189076">189076</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-08-27 17:04:52 -0700 (Thu, 27 Aug 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make DLLLauncherMain executables dependent on dll
https://bugs.webkit.org/show_bug.cgi?id=148548

Reviewed by Brent Fulgham.

Source/JavaScriptCore:

* shell/CMakeLists.txt:
* shell/PlatformWin.cmake:

Tools:

* DumpRenderTree/CMakeLists.txt:
* DumpRenderTree/PlatformWin.cmake:
* MiniBrowser/win/CMakeLists.txt:
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/PlatformWin.cmake:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreshellCMakeListstxt">trunk/Source/JavaScriptCore/shell/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreshellPlatformWincmake">trunk/Source/JavaScriptCore/shell/PlatformWin.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeCMakeListstxt">trunk/Tools/DumpRenderTree/CMakeLists.txt</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformWincmake">trunk/Tools/DumpRenderTree/PlatformWin.cmake</a></li>
<li><a href="#trunkToolsMiniBrowserwinCMakeListstxt">trunk/Tools/MiniBrowser/win/CMakeLists.txt</a></li>
<li><a href="#trunkToolsTestWebKitAPICMakeListstxt">trunk/Tools/TestWebKitAPI/CMakeLists.txt</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformWincmake">trunk/Tools/TestWebKitAPI/PlatformWin.cmake</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189075 => 189076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-08-28 00:04:52 UTC (rev 189076)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-27  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Make DLLLauncherMain executables dependent on dll
+        https://bugs.webkit.org/show_bug.cgi?id=148548
+
+        Reviewed by Brent Fulgham.
+
+        * shell/CMakeLists.txt:
+        * shell/PlatformWin.cmake:
+
</ins><span class="cx"> 2015-08-27  Filip Pizlo  &lt;fpizlo@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         DFG::StrCat isn't really effectful
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreshellCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/shell/CMakeLists.txt (189075 => 189076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/shell/CMakeLists.txt        2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Source/JavaScriptCore/shell/CMakeLists.txt        2015-08-28 00:04:52 UTC (rev 189076)
</span><span class="lines">@@ -31,3 +31,7 @@
</span><span class="cx"> if (SHOULD_INSTALL_JS_SHELL)
</span><span class="cx">     install(TARGETS jsc DESTINATION &quot;${EXEC_INSTALL_DIR}&quot;)
</span><span class="cx"> endif ()
</span><ins>+
+if (WIN32)
+    add_dependencies(jsc jscLib)
+endif ()
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreshellPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/shell/PlatformWin.cmake (189075 => 189076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/shell/PlatformWin.cmake        2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Source/JavaScriptCore/shell/PlatformWin.cmake        2015-08-28 00:04:52 UTC (rev 189076)
</span><span class="lines">@@ -1,13 +1,13 @@
</span><span class="cx"> include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
</span><del>-add_library(jscdll SHARED ${JSC_SOURCES})
</del><ins>+add_library(jscLib SHARED ${JSC_SOURCES})
</ins><span class="cx"> 
</span><span class="cx"> list(APPEND JSC_LIBRARIES
</span><span class="cx">     Winmm
</span><span class="cx"> )
</span><span class="cx"> 
</span><del>-target_link_libraries(jscdll ${JSC_LIBRARIES})
-set_target_properties(jscdll PROPERTIES FOLDER &quot;JavaScriptCore&quot;)
-set_target_properties(jscdll PROPERTIES OUTPUT_NAME &quot;jsc${DEBUG_SUFFIX}&quot;)
</del><ins>+target_link_libraries(jscLib ${JSC_LIBRARIES})
+set_target_properties(jscLib PROPERTIES FOLDER &quot;JavaScriptCore&quot;)
+set_target_properties(jscLib PROPERTIES OUTPUT_NAME &quot;jsc${DEBUG_SUFFIX}&quot;)
</ins><span class="cx"> 
</span><span class="cx"> if (${WTF_PLATFORM_WIN_CAIRO})
</span><span class="cx">     add_definitions(-DWIN_CAIRO)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189075 => 189076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/ChangeLog        2015-08-28 00:04:52 UTC (rev 189076)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-27  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Make DLLLauncherMain executables dependent on dll
+        https://bugs.webkit.org/show_bug.cgi?id=148548
+
+        Reviewed by Brent Fulgham.
+
+        * DumpRenderTree/CMakeLists.txt:
+        * DumpRenderTree/PlatformWin.cmake:
+        * MiniBrowser/win/CMakeLists.txt:
+        * TestWebKitAPI/CMakeLists.txt:
+        * TestWebKitAPI/PlatformWin.cmake:
+
</ins><span class="cx"> 2015-08-27  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove Mac slaves 188/189 after being replaced with 400/401.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (189075 => 189076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/CMakeLists.txt        2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt        2015-08-28 00:04:52 UTC (rev 189076)
</span><span class="lines">@@ -121,3 +121,7 @@
</span><span class="cx"> add_library(TestNetscapePlugin SHARED ${TestNetscapePlugin_SOURCES})
</span><span class="cx"> target_link_libraries(TestNetscapePlugin ${TestNetscapePlugin_LIBRARIES})
</span><span class="cx"> set_target_properties(TestNetscapePlugin PROPERTIES FOLDER &quot;Tools&quot;)
</span><ins>+
+if (WIN32)
+    add_dependencies(DumpRenderTree DumpRenderTreeLib)
+endif ()
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (189075 => 189076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformWin.cmake        2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake        2015-08-28 00:04:52 UTC (rev 189076)
</span><span class="lines">@@ -138,4 +138,6 @@
</span><span class="cx"> set_target_properties(ImageDiffLib PROPERTIES OUTPUT_NAME &quot;ImageDiff&quot;)
</span><span class="cx"> target_link_libraries(ImageDiffLib ${ImageDiff_LIBRARIES})
</span><span class="cx"> 
</span><ins>+add_dependencies(ImageDiff ImageDiffLib)
+
</ins><span class="cx"> add_definitions(-D_UNICODE)
</span></span></pre></div>
<a id="trunkToolsMiniBrowserwinCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (189075 => 189076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/win/CMakeLists.txt        2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt        2015-08-28 00:04:52 UTC (rev 189076)
</span><span class="lines">@@ -62,3 +62,5 @@
</span><span class="cx"> target_link_libraries(MiniBrowser shlwapi)
</span><span class="cx"> set_target_properties(MiniBrowser PROPERTIES FOLDER &quot;Tools&quot;)
</span><span class="cx"> set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME &quot;MiniBrowser&quot;)
</span><ins>+
+add_dependencies(MiniBrowser MiniBrowserLib)
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPICMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (189075 => 189076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/CMakeLists.txt        2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt        2015-08-28 00:04:52 UTC (rev 189076)
</span><span class="lines">@@ -168,6 +168,10 @@
</span><span class="cx">     ${TestWTF_SOURCES}
</span><span class="cx"> )
</span><span class="cx"> 
</span><ins>+if (WIN32)
+    add_dependencies(TestWTF TestWTFLib)
+endif ()
+
</ins><span class="cx"> target_link_libraries(TestWTF ${test_wtf_LIBRARIES})
</span><span class="cx"> add_dependencies(TestWTF WTF ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
</span><span class="cx"> add_test(TestWTF ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF}/TestWTF)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (189075 => 189076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake        2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake        2015-08-28 00:04:52 UTC (rev 189076)
</span><span class="lines">@@ -133,3 +133,6 @@
</span><span class="cx"> set(test_main_SOURCES
</span><span class="cx">     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
</span><span class="cx"> )
</span><ins>+
+add_dependencies(TestWebCore TestWebCoreLib)
+add_dependencies(TestWebKit TestWebKitLib)
</ins></span></pre>
</div>
</div>

</body>
</html>