<!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>[187997] 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/187997">187997</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 16:02:25 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build DumpRenderTree with CMake.
https://bugs.webkit.org/show_bug.cgi?id=147519
Reviewed by Brent Fulgham.
Source/WebCore:
* CMakeLists.txt:
WebCoreTestSupport is a static library and should not be linked with WebCore.
Source/WebKit:
* CMakeLists.txt:
* PlatformMac.cmake:
* PlatformWin.cmake:
Make the libraries WebKit links with private, which means that CMake will not make everything
that links with WebKit link with everything WebKit links with.
Source/WebKit/win:
* WebView.cpp:
Include JSScriptProfile.h to export toJS(ExecState*, JSDomGlobalObject*, JSC::Profile*) from WebKit.dll.
Tools:
* CMakeLists.txt:
Build the DumpRenderTree directory now that it builds successfully.
* DumpRenderTree/CMakeLists.txt:
Added missing source file and don't link with WebCore.lib.
* DumpRenderTree/PlatformWin.cmake:
Added sources to DumpRenderTreeLib and made DumpRenderTree only build DLLLauncherMain.cpp.
* WinLauncher/CMakeLists.txt:
We need libcmt now that we are not linking with WebCore.lib.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitCMakeListstxt">trunk/Source/WebKit/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkToolsCMakeListstxt">trunk/Tools/CMakeLists.txt</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="#trunkToolsWinLauncherCMakeListstxt">trunk/Tools/WinLauncher/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -3294,7 +3294,6 @@
</span><span class="cx"> set(WebCoreTestSupport_LIBRARIES
</span><span class="cx"> JavaScriptCore
</span><span class="cx"> WTF
</span><del>- WebCore
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Modules that the bindings generator scripts may use
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-05 Alex Christensen <achristensen@webkit.org>
+
+ Build DumpRenderTree with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147519
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ WebCoreTestSupport is a static library and should not be linked with WebCore.
+
</ins><span class="cx"> 2015-08-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move some more DatabaseBackendBase functions to Database
</span></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -17,9 +17,9 @@
</span><span class="cx"> set(WebKit_SYSTEM_INCLUDE_DIRECTORIES "")
</span><span class="cx">
</span><span class="cx"> set(WebKit_LIBRARIES
</span><del>- JavaScriptCore
- WTF
- WebCore
</del><ins>+ PRIVATE JavaScriptCore
+ PRIVATE WTF
+ PRIVATE WebCore
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/ChangeLog 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-05 Alex Christensen <achristensen@webkit.org>
+
+ Build DumpRenderTree with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147519
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+ Make the libraries WebKit links with private, which means that CMake will not make everything
+ that links with WebKit link with everything WebKit links with.
+
</ins><span class="cx"> 2015-08-04 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename Mutex to DeprecatedMutex
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -28,24 +28,24 @@
</span><span class="cx"> link_directories(../../WebKitLibraries)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_LIBRARIES
</span><del>- ${ACCELERATE_LIBRARY}
- ${AUDIOTOOLBOX_LIBRARY}
- ${AUDIOUNIT_LIBRARY}
- ${CARBON_LIBRARY}
- ${COCOA_LIBRARY}
- ${COREAUDIO_LIBRARY}
- ${DISKARBITRATION_LIBRARY}
- ${IOKIT_LIBRARY}
- ${IOSURFACE_LIBRARY}
- ${OPENGL_LIBRARY}
- ${PDFKIT_FRAMEWORK}/PDFKit
- ${QUARTZ_LIBRARY}
- ${QUARTZCORE_LIBRARY}
- ${SECURITY_LIBRARY}
- ${SQLITE3_LIBRARY}
- ${WEBKITSYSTEMINTERFACE_LIBRARY}
- ${XML2_LIBRARY}
- ${ZLIB_LIBRARIES}
</del><ins>+ PRIVATE ${ACCELERATE_LIBRARY}
+ PRIVATE ${AUDIOTOOLBOX_LIBRARY}
+ PRIVATE ${AUDIOUNIT_LIBRARY}
+ PRIVATE ${CARBON_LIBRARY}
+ PRIVATE ${COCOA_LIBRARY}
+ PRIVATE ${COREAUDIO_LIBRARY}
+ PRIVATE ${DISKARBITRATION_LIBRARY}
+ PRIVATE ${IOKIT_LIBRARY}
+ PRIVATE ${IOSURFACE_LIBRARY}
+ PRIVATE ${OPENGL_LIBRARY}
+ PRIVATE ${PDFKIT_FRAMEWORK}/PDFKit
+ PRIVATE ${QUARTZ_LIBRARY}
+ PRIVATE ${QUARTZCORE_LIBRARY}
+ PRIVATE ${SECURITY_LIBRARY}
+ PRIVATE ${SQLITE3_LIBRARY}
+ PRIVATE ${WEBKITSYSTEMINTERFACE_LIBRARY}
+ PRIVATE ${XML2_LIBRARY}
+ PRIVATE ${ZLIB_LIBRARIES}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDE_DIRECTORIES
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -11,8 +11,8 @@
</span><span class="cx"> win/WebURLAuthenticationChallengeSenderCURL.cpp
</span><span class="cx"> )
</span><span class="cx"> list(APPEND WebKit_LIBRARIES
</span><del>- libeay32.lib
- ssleay32.lib
</del><ins>+ PRIVATE libeay32.lib
+ PRIVATE ssleay32.lib
</ins><span class="cx"> )
</span><span class="cx"> else ()
</span><span class="cx"> list(APPEND WebKit_SOURCES_Classes
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> win/WebURLAuthenticationChallengeSenderCFNet.cpp
</span><span class="cx"> )
</span><span class="cx"> list(APPEND WebKit_LIBRARIES
</span><del>- WebKitSystemInterface
</del><ins>+ PRIVATE WebKitSystemInterface
</ins><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="lines">@@ -417,15 +417,15 @@
</span><span class="cx"> set_target_properties(WebKitGUID PROPERTIES FOLDER "WebKit")
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_LIBRARIES
</span><del>- Comctl32
- Comsupp
- Crypt32
- Iphlpapi
- Rpcrt4
- Shlwapi
- Usp10
- Version
- WebKitGUID
</del><ins>+ PRIVATE Comctl32
+ PRIVATE Comsupp
+ PRIVATE Crypt32
+ PRIVATE Iphlpapi
+ PRIVATE Rpcrt4
+ PRIVATE Shlwapi
+ PRIVATE Usp10
+ PRIVATE Version
+ PRIVATE WebKitGUID
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (ENABLE_GRAPHICS_CONTEXT_3D)
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-05 Alex Christensen <achristensen@webkit.org>
+
+ Build DumpRenderTree with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147519
+
+ Reviewed by Brent Fulgham.
+
+ * WebView.cpp:
+ Include JSScriptProfile.h to export toJS(ExecState*, JSDomGlobalObject*, JSC::Profile*) from WebKit.dll.
+
</ins><span class="cx"> 2015-08-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix Windows build.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -120,6 +120,7 @@
</span><span class="cx"> #include <WebCore/HitTestResult.h>
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <WebCore/JSElement.h>
</span><ins>+#include <WebCore/JSScriptProfile.h>
</ins><span class="cx"> #include <WebCore/KeyboardEvent.h>
</span><span class="cx"> #include <WebCore/Logging.h>
</span><span class="cx"> #include <WebCore/MIMETypeRegistry.h>
</span></span></pre></div>
<a id="trunkToolsCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CMakeLists.txt (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CMakeLists.txt 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Tools/CMakeLists.txt 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (WIN32)
</span><del>- # FIXME: Get DumpRenderTree working with CMake.
</del><ins>+ add_subdirectory(DumpRenderTree)
</ins><span class="cx"> add_subdirectory(WinLauncher)
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Tools/ChangeLog 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-05 Alex Christensen <achristensen@webkit.org>
+
+ Build DumpRenderTree with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147519
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ Build the DumpRenderTree directory now that it builds successfully.
+ * DumpRenderTree/CMakeLists.txt:
+ Added missing source file and don't link with WebCore.lib.
+ * DumpRenderTree/PlatformWin.cmake:
+ Added sources to DumpRenderTreeLib and made DumpRenderTree only build DLLLauncherMain.cpp.
+ * WinLauncher/CMakeLists.txt:
+ We need libcmt now that we are not linking with WebCore.lib.
+
</ins><span class="cx"> 2015-08-05 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> AppScale: Use https URLs for subresources and links
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> CyclicRedundancyCheck.cpp
</span><span class="cx"> DumpRenderTreeCommon.cpp
</span><span class="cx"> GCController.cpp
</span><ins>+ JavaScriptThreading.cpp
</ins><span class="cx"> PixelDumpSupport.cpp
</span><span class="cx"> TestRunner.cpp
</span><span class="cx"> WorkQueue.cpp
</span><span class="lines">@@ -13,7 +14,6 @@
</span><span class="cx"> set(DumpRenderTree_LIBRARIES
</span><span class="cx"> JavaScriptCore
</span><span class="cx"> WTF
</span><del>- WebCore
</del><span class="cx"> WebCoreTestSupport
</span><span class="cx"> WebKit
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -1,22 +1,64 @@
</span><del>-list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
- win
-)
-
-list(APPEND DumpRenderTree_SOURCES
</del><ins>+set(DumpRenderTreeLib_SOURCES
+ ${DumpRenderTree_SOURCES}
</ins><span class="cx"> win/AccessibilityControllerWin.cpp
</span><span class="cx"> win/AccessibilityUIElementWin.cpp
</span><ins>+ win/DRTDataObject.cpp
+ win/DRTDesktopNotificationPresenter.cpp
+ win/DRTDropSource.cpp
+ win/DumpRenderTree.cpp
+ win/EditingDelegate.cpp
+ win/EventSender.cpp
+ win/FrameLoadDelegate.cpp
</ins><span class="cx"> win/GCControllerWin.cpp
</span><ins>+ win/HistoryDelegate.cpp
+ win/MD5.cpp
</ins><span class="cx"> win/PixelDumpSupportWin.cpp
</span><ins>+ win/PolicyDelegate.cpp
+ win/ResourceLoadDelegate.cpp
</ins><span class="cx"> win/TestRunnerWin.cpp
</span><ins>+ win/TextInputController.cpp
+ win/TextInputControllerWin.cpp
+ win/UIDelegate.cpp
</ins><span class="cx"> win/WorkQueueItemWin.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+set(DumpRenderTree_SOURCES
+ ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
+)
+
+list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
+ win
+)
+
+list(APPEND DumpRenderTree_LIBRARIES
+ shlwapi
+)
+
+set(DumpRenderTreeLib_LIBRARIES
+ ${DumpRenderTree_LIBRARIES}
+ Comsuppw
+ Oleacc
+ WebKitGUID
+)
+
</ins><span class="cx"> if (${WTF_PLATFORM_WIN_CAIRO})
</span><span class="cx"> list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
</span><span class="cx"> cairo
</span><span class="cx"> "$ENV{WEBKIT_LIBRARIES}/include/cairo"
</span><span class="cx"> )
</span><del>- list(APPEND DumpRenderTree_SOURCES
</del><ins>+ list(APPEND DumpRenderTreeLib_SOURCES
</ins><span class="cx"> cairo/PixelDumpSupportCairo.cpp
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><ins>+
+ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTreeLib_SOURCES)
+
+add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES})
+set_target_properties(DumpRenderTreeLib PROPERTIES FOLDER "Tools")
+set_target_properties(DumpRenderTreeLib PROPERTIES OUTPUT_NAME "DumpRenderTree")
+target_link_libraries(DumpRenderTreeLib ${DumpRenderTreeLib_LIBRARIES})
+
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
+
+add_definitions(-D_UNICODE)
+
</ins></span></pre></div>
<a id="trunkToolsWinLauncherCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/CMakeLists.txt (187996 => 187997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/CMakeLists.txt 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Tools/WinLauncher/CMakeLists.txt 2015-08-05 23:02:25 UTC (rev 187997)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
</del><span class="cx"> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
</span><span class="cx">
</span><span class="cx"> if (${WTF_PLATFORM_WIN_CAIRO})
</span></span></pre>
</div>
</div>
</body>
</html>