<!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>[188694] 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/188694">188694</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-08-20 12:08:06 -0700 (Thu, 20 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up CMake build after <a href="http://trac.webkit.org/projects/webkit/changeset/188673">r188673</a>
https://bugs.webkit.org/show_bug.cgi?id=148234
Reviewed by Tim Horton.
Source/JavaScriptCore:
* shell/PlatformWin.cmake:
Define WIN_CAIRO so the WinCairo jsc.exe can find the correct dlls.
Source/ThirdParty:
* gtest/CMakeLists.txt:
gtest needs to be a static library on Windows to not crash.
Source/ThirdParty/ANGLE:
* CMakeLists.txt:
Copy headers to forwarding headers.
Source/WebCore:
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformWin.cmake:
Make including ANGLE headers platform specific because EFL and GTK don't want to copy headers,
but we need to in order to get the Windows build working with each Source subdirectory isolated.
Source/WebKit:
* PlatformWin.cmake:
Include ANGLE forwarding headers directories.
Tools:
* DumpRenderTree/PlatformWin.cmake:
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/PlatformWin.cmake:
Define WIN_CAIRO so WinCairo executables can find the correct dlls in WebKitLibraries.
gtest needs to be a static library on Windows to not crash.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreshellPlatformWincmake">trunk/Source/JavaScriptCore/shell/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceThirdPartyANGLECMakeListstxt">trunk/Source/ThirdParty/ANGLE/CMakeLists.txt</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyChangeLog">trunk/Source/ThirdParty/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartygtestCMakeListstxt">trunk/Source/ThirdParty/gtest/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformWincmake">trunk/Tools/DumpRenderTree/PlatformWin.cmake</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 (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-20 Alex Christensen <achristensen@webkit.org>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * shell/PlatformWin.cmake:
+ Define WIN_CAIRO so the WinCairo jsc.exe can find the correct dlls.
+
</ins><span class="cx"> 2015-08-20 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> A watchdog tests is failing on Windows.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreshellPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/shell/PlatformWin.cmake (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/shell/PlatformWin.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/JavaScriptCore/shell/PlatformWin.cmake 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -4,6 +4,10 @@
</span><span class="cx"> set_target_properties(jscdll PROPERTIES FOLDER "JavaScriptCore")
</span><span class="cx"> set_target_properties(jscdll PROPERTIES OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
</span><span class="cx">
</span><ins>+if (${WTF_PLATFORM_WIN_CAIRO})
+ add_definitions(-DWIN_CAIRO)
+endif ()
+
</ins><span class="cx"> set(JSC_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
</span><span class="cx"> set(JSC_LIBRARIES shlwapi)
</span><span class="cx"> add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLECMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -278,6 +278,31 @@
</span><span class="cx"> libANGLE
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES2)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLSLANG)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr)
+file(GLOB _files_ANGLE "${THIRDPARTY_DIR}/ANGLE/ANGLE/*.h")
+file(GLOB _files_egl "${THIRDPARTY_DIR}/ANGLE/include/egl/*.h")
+file(GLOB _files_GLES2 "${THIRDPARTY_DIR}/ANGLE/include/GLES2/*.h")
+file(GLOB _files_GLSLANG "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG/*.h")
+file(GLOB _files_khr "${THIRDPARTY_DIR}/ANGLE/include/khr/*.h")
+foreach (_file ${_files_ANGLE})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/)
+endforeach ()
+foreach (_file ${_files_egl})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl)
+endforeach ()
+foreach (_file ${_files_GLES2})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES2)
+endforeach ()
+foreach (_file ${_files_GLSLANG})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLSLANG)
+endforeach ()
+foreach (_file ${_files_khr})
+ file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr)
+endforeach ()
+
</ins><span class="cx"> set_target_properties(libANGLE PROPERTIES FOLDER "ANGLE")
</span><span class="cx"> set_target_properties(libEGL PROPERTIES FOLDER "ANGLE")
</span><span class="cx"> set_target_properties(libGLESv2 PROPERTIES FOLDER "ANGLE")
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-20 Alex Christensen <achristensen@webkit.org>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ Copy headers to forwarding headers.
+
</ins><span class="cx"> 2015-08-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Switch Windows build to Visual Studio 2015
</span></span></pre></div>
<a id="trunkSourceThirdPartyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ChangeLog (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/ThirdParty/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-20 Alex Christensen <achristensen@webkit.org>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * gtest/CMakeLists.txt:
+ gtest needs to be a static library on Windows to not crash.
+
</ins><span class="cx"> 2015-08-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Switch Windows build to Visual Studio 2015
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/CMakeLists.txt (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/CMakeLists.txt 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/ThirdParty/gtest/CMakeLists.txt 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -26,12 +26,16 @@
</span><span class="cx">
</span><span class="cx"> if (WIN32)
</span><span class="cx"> # MSVC 2015 requires this definition for INTMAX_MAX to be defined.
</span><del>- add_definitions(-D__STDC_LIMIT_MACROS)
</del><ins>+ add_definitions(-D__STDC_LIMIT_MACROS -DGTEST_CREATE_SHARED_LIBRARY=0)
+ # gtest crashes on exit on Windows if it is a dll.
+ add_library(gtest STATIC ${GTEST_SOURCES})
+else ()
+ add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=1)
+ add_library(gtest SHARED ${GTEST_SOURCES})
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><del>-add_library(gtest SHARED ${GTEST_SOURCES})
</del><span class="cx"> include_directories(${GTEST_INCLUDE_DIRECTORIES})
</span><del>-add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=1 -DGTEST_HAS_RTTI=0)
</del><ins>+add_definitions(-DGTEST_HAS_RTTI=0)
</ins><span class="cx">
</span><span class="cx"> # FIXME: This works around compatibility problems in the old version of the third-pary
</span><span class="cx"> # googletest source code checkout. It should be removed once we upgrade to a newer version.
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -3187,11 +3187,6 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${THIRDPARTY_DIR}/ANGLE/"
- "${THIRDPARTY_DIR}/ANGLE/include/KHR"
-)
-
</del><span class="cx"> if (ENABLE_WEB_REPLAY)
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/inspector"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebCore/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-08-20 Alex Christensen <achristensen@webkit.org>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformWin.cmake:
+ Make including ANGLE headers platform specific because EFL and GTK don't want to copy headers,
+ but we need to in order to get the Windows build working with each Source subdirectory isolated.
+
</ins><span class="cx"> 2015-08-20 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Standalone image documents should send their size to the UIClient just like
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -18,6 +18,8 @@
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/profiler"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/runtime"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/yarr"
</span><ins>+ "${THIRDPARTY_DIR}/ANGLE/"
+ "${THIRDPARTY_DIR}/ANGLE/include/KHR"
</ins><span class="cx"> "${WEBCORE_DIR}/editing/atk"
</span><span class="cx"> "${WEBCORE_DIR}/page/efl"
</span><span class="cx"> "${WEBCORE_DIR}/page/scrolling/coordinatedgraphics"
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -20,6 +20,8 @@
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/profiler"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/runtime"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/yarr"
</span><ins>+ "${THIRDPARTY_DIR}/ANGLE/"
+ "${THIRDPARTY_DIR}/ANGLE/include/KHR"
</ins><span class="cx"> "${WEBCORE_DIR}/accessibility/atk"
</span><span class="cx"> "${WEBCORE_DIR}/editing/atk"
</span><span class="cx"> "${WEBCORE_DIR}/page/gtk"
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx"> add_definitions(/bigobj)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><ins>+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/KHR"
</ins><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/ForwardingHeaders"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/API"
</span><span class="lines">@@ -258,6 +260,14 @@
</span><span class="cx"> DESTINATION
</span><span class="cx"> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj
</span><span class="cx"> )
</span><ins>+if (${WTF_PLATFORM_WIN_CAIRO} AND EXISTS ${WEBKIT_LIBRARIES_DIR}/cacert.pem)
+ make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/certificates)
+ file(COPY
+ ${WEBKIT_LIBRARIES_DIR}/cacert.pem
+ DESTINATION
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/certificates
+ )
+endif ()
</ins><span class="cx">
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebKit/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-20 Alex Christensen <achristensen@webkit.org>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * PlatformWin.cmake:
+ Include ANGLE forwarding headers directories.
+
</ins><span class="cx"> 2015-08-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> CMake Windows build should not include files directly from other Source directories
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -57,6 +57,10 @@
</span><span class="cx"> "${DERIVED_SOURCES_WEBKIT_DIR}/include"
</span><span class="cx"> "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}"
</span><ins>+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDES
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Tools/ChangeLog 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-20 Alex Christensen <achristensen@webkit.org>
+
+ Clean up CMake build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148234
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/PlatformWin.cmake:
+ * TestWebKitAPI/CMakeLists.txt:
+ * TestWebKitAPI/PlatformWin.cmake:
+ Define WIN_CAIRO so WinCairo executables can find the correct dlls in WebKitLibraries.
+ gtest needs to be a static library on Windows to not crash.
+
</ins><span class="cx"> 2015-08-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> CMake Windows build should not include files directly from other Source directories
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -44,6 +44,10 @@
</span><span class="cx"> TestNetscapePlugin/win/WindowedPluginTest.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+if (${WTF_PLATFORM_WIN_CAIRO})
+ add_definitions(-DWIN_CAIRO)
+endif ()
+
</ins><span class="cx"> list(APPEND TestNetscapePlugin_LIBRARIES
</span><span class="cx"> Msimg32
</span><span class="cx"> Shlwapi
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPICMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -146,7 +146,13 @@
</span><span class="cx"> get_property(TestWebKitAPIInjectedBundle_PATH TARGET TestWebKitAPIInjectedBundle PROPERTY LOCATION)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1 -DGTEST_HAS_RTTI=0
</del><ins>+if (WIN32)
+ add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=0)
+else ()
+ add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
+endif ()
+
+add_definitions(-DGTEST_HAS_RTTI=0
</ins><span class="cx"> -DTEST_WEBKIT2_RESOURCES_DIR=\"${TESTWEBKITAPI_DIR}/Tests/WebKit2\"
</span><span class="cx"> -DTEST_INJECTED_BUNDLE_PATH=\"${TestWebKitAPIInjectedBundle_PATH}\"
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (188693 => 188694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-20 18:46:19 UTC (rev 188693)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-20 19:08:06 UTC (rev 188694)
</span><span class="lines">@@ -2,6 +2,10 @@
</span><span class="cx"> set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}")
</span><span class="cx"> add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
</span><span class="cx">
</span><ins>+if (${WTF_PLATFORM_WIN_CAIRO})
+ add_definitions(-DWIN_CAIRO)
+endif ()
+
</ins><span class="cx"> set(test_main_SOURCES
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/win/main.cpp
</span><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>