<!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>[188673] 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/188673">188673</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-08-19 17:56:23 -0700 (Wed, 19 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CMake Windows build should not include files directly from other Source directories
https://bugs.webkit.org/show_bug.cgi?id=148198
Reviewed by Brent Fulgham.
.:
* Source/cmake/WebKitMacros.cmake:
Source/JavaScriptCore:
* CMakeLists.txt:
JavaScriptCore_FORWARDING_HEADERS_FILES is no longer necessary because all the headers
that used to be in it are now in JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWin.cmake:
Source/WebCore:
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformWin.cmake:
Source/WebKit:
* CMakeLists.txt:
* PlatformWin.cmake:
Source/WebKit/win:
* WebKitPrefix.h:
Include cmakeconfig.h to properly define all enabled features.
Source/WTF:
* wtf/CMakeLists.txt:
* wtf/PlatformWin.cmake:
Tools:
* DumpRenderTree/DumpRenderTreePrefix.h:
Include cmakeconfig.h to properly define all enabled features.
* DumpRenderTree/PlatformWin.cmake:
* TestWebKitAPI/PlatformWin.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformEflcmake">trunk/Source/JavaScriptCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformGTKcmake">trunk/Source/JavaScriptCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformMaccmake">trunk/Source/JavaScriptCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformWincmake">trunk/Source/JavaScriptCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWTFwtfPlatformWincmake">trunk/Source/WTF/wtf/PlatformWin.cmake</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="#trunkSourceWebKitCMakeListstxt">trunk/Source/WebKit/CMakeLists.txt</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="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebKitPrefixh">trunk/Source/WebKit/win/WebKitPrefix.h</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreePrefixh">trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformWincmake">trunk/Tools/DumpRenderTree/PlatformWin.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformWincmake">trunk/Tools/TestWebKitAPI/PlatformWin.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/ChangeLog 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2015-08-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ CMake Windows build should not include files directly from other Source directories
+ https://bugs.webkit.org/show_bug.cgi?id=148198
+
+ Reviewed by Brent Fulgham.
+
+ * Source/cmake/WebKitMacros.cmake:
+
+2015-08-19 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Build TestWTF on Mac with CMake.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147972
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> set(JavaScriptCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${CMAKE_BINARY_DIR}"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}"
</span><ins>+ "${JAVASCRIPTCORE_DIR}/.."
</ins><span class="cx"> "${JAVASCRIPTCORE_DIR}/API"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/assembler"
</span><span class="lines">@@ -31,12 +32,10 @@
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/tools"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/wasm"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/yarr"
</span><del>- "${WTF_DIR}"
</del><span class="cx"> "${DERIVED_SOURCES_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
</span><span class="cx"> "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
</span><del>- "${CMAKE_SOURCE_DIR}/Source"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
</span><span class="lines">@@ -920,10 +919,13 @@
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span><span class="cx"> set(JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
</span><ins>+ API
</ins><span class="cx"> assembler
</span><span class="cx"> bindings
</span><span class="cx"> bytecode
</span><span class="cx"> debugger
</span><ins>+ dfg
+ disassembler
</ins><span class="cx"> heap
</span><span class="cx"> inspector
</span><span class="cx"> interpreter
</span><span class="lines">@@ -939,76 +941,8 @@
</span><span class="cx"> inspector/agents
</span><span class="cx"> inspector/augmentable
</span><span class="cx"> inspector/remote
</span><del>-
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
</del><span class="cx"> )
</span><span class="cx">
</span><del>-set(JavaScriptCore_FORWARDING_HEADERS_FILES
- API/APICallbackFunction.h
- API/APICast.h
- API/JSAPIWrapperObject.h
- API/JSBase.h
- API/JSBasePrivate.h
- API/JSCTestRunnerUtils.h
- API/JSCallbackConstructor.h
- API/JSCallbackFunction.h
- API/JSCallbackObject.h
- API/JSCallbackObjectFunctions.h
- API/JSClassRef.h
- API/JSContext.h
- API/JSContextInternal.h
- API/JSContextPrivate.h
- API/JSContextRef.h
- API/JSContextRefInternal.h
- API/JSContextRefPrivate.h
- API/JSExport.h
- API/JSManagedValue.h
- API/JSManagedValueInternal.h
- API/JSObjectRef.h
- API/JSObjectRefPrivate.h
- API/JSProfilerPrivate.h
- API/JSRetainPtr.h
- API/JSScriptRefPrivate.h
- API/JSStringRef.h
- API/JSStringRefBSTR.h
- API/JSStringRefCF.h
- API/JSStringRefPrivate.h
- API/JSValue.h
- API/JSValueInternal.h
- API/JSValueRef.h
- API/JSVirtualMachine.h
- API/JSVirtualMachineInternal.h
- API/JSWeakObjectMapRefInternal.h
- API/JSWeakObjectMapRefPrivate.h
- API/JSWrapperMap.h
- API/JavaScript.h
- API/JavaScriptCore.h
- API/ObjcRuntimeExtras.h
- API/OpaqueJSString.h
- API/WebKitAvailability.h
-
- assembler/LinkBuffer.h
- assembler/MacroAssembler.h
- assembler/MacroAssemblerCodeRef.h
-
- inspector/augmentable/AugmentableInspectorController.h
-
- inspector/remote/RemoteInspector.h
- inspector/remote/RemoteInspectorConstants.h
- inspector/remote/RemoteInspectorDebuggable.h
- inspector/remote/RemoteInspectorDebuggableConnection.h
- inspector/remote/RemoteInspectorXPCConnection.h
-
- jit/GPRInfo.h
-
- runtime/VM.h
-
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h
-)
-
-
</del><span class="cx"> # GENERATOR 1-B: particular LUT creator (for 1 file only)
</span><span class="cx"> GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h)
</span><span class="cx">
</span><span class="lines">@@ -1198,6 +1132,10 @@
</span><span class="cx"> set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
</span><span class="cx"> set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore")
</span><span class="cx">
</span><ins>+if (JavaScriptCore_POST_BUILD_COMMAND)
+ add_custom_command(TARGET JavaScriptCore POST_BUILD COMMAND ${JavaScriptCore_POST_BUILD_COMMAND} VERBATIM)
+endif ()
+
</ins><span class="cx"> if (JavaScriptCore_OUTPUT_NAME)
</span><span class="cx"> set_target_properties(JavaScriptCore PROPERTIES OUTPUT_NAME ${JavaScriptCore_OUTPUT_NAME})
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-19 Alex Christensen <achristensen@webkit.org>
+
+ CMake Windows build should not include files directly from other Source directories
+ https://bugs.webkit.org/show_bug.cgi?id=148198
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ JavaScriptCore_FORWARDING_HEADERS_FILES is no longer necessary because all the headers
+ that used to be in it are now in JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+
</ins><span class="cx"> 2015-08-19 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE_WEBVTT_REGIONS
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformEfl.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformEfl.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/JavaScriptCore/PlatformEfl.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> ${ECORE_INCLUDE_DIRS}
</span><span class="cx"> ${EINA_INCLUDE_DIRS}
</span><span class="cx"> ${EO_INCLUDE_DIRS}
</span><ins>+ "${WTF_DIR}"
</ins><span class="cx"> "${WTF_DIR}/wtf/efl"
</span><span class="cx"> )
</span><span class="cx"> add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformGTK.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformGTK.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/JavaScriptCore/PlatformGTK.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
</span><span class="cx">
</span><ins>+list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+ "${WTF_DIR}"
+)
+
</ins><span class="cx"> configure_file(javascriptcoregtk.pc.in ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc @ONLY)
</span><span class="cx"> configure_file(JavaScriptCore.gir.in ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir @ONLY)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
</span><ins>+ ${WTF_DIR}
</ins><span class="cx"> ${JAVASCRIPTCORE_DIR}/disassembler/udis86
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/icu
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformWin.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformWin.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/JavaScriptCore/PlatformWin.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -35,4 +35,15 @@
</span><span class="cx"> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+foreach (_directory ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES})
+ file(GLOB _files "${JAVASCRIPTCORE_DIR}/${_directory}/*.h")
+ foreach (_file ${_files})
+ file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore")
+ endforeach ()
+endforeach ()
+
+set(JavaScriptCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/postBuild.cmd")
+file(WRITE "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore)
+
</ins><span class="cx"> set(JavaScriptCore_OUTPUT_NAME JavaScriptCore${DEBUG_SUFFIX})
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WTF/ChangeLog 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-19 Alex Christensen <achristensen@webkit.org>
+
+ CMake Windows build should not include files directly from other Source directories
+ https://bugs.webkit.org/show_bug.cgi?id=148198
+
+ Reviewed by Brent Fulgham.
+
+ * wtf/CMakeLists.txt:
+ * wtf/PlatformWin.cmake:
+
</ins><span class="cx"> 2015-08-18 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace all uses of std::mutex/std::condition_variable with WTF::Lock/WTF::Condition
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -273,6 +273,10 @@
</span><span class="cx"> set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF")
</span><span class="cx"> set_target_properties(WTF PROPERTIES FOLDER "JavaScriptCore")
</span><span class="cx">
</span><ins>+if (WTF_POST_BUILD_COMMAND)
+ add_custom_command(TARGET WTF POST_BUILD COMMAND ${WTF_POST_BUILD_COMMAND} VERBATIM)
+endif ()
+
</ins><span class="cx"> if (WTF_OUTPUT_NAME)
</span><span class="cx"> set_target_properties(WTF PROPERTIES OUTPUT_NAME ${WTF_OUTPUT_NAME})
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformWin.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformWin.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WTF/wtf/PlatformWin.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -29,6 +29,10 @@
</span><span class="cx"> "${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+set(WTF_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WTF/postBuild.cmd")
+file(WRITE "${WTF_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WTF_DIR}/wtf/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_DIR}/WTF/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n")
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF)
+
</ins><span class="cx"> # FIXME: This should run testOSXLevel.cmd if it is available.
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=135861
</span><span class="cx"> add_custom_command(
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -108,28 +108,8 @@
</span><span class="cx"> "${WEBCORE_DIR}/workers"
</span><span class="cx"> "${WEBCORE_DIR}/xml"
</span><span class="cx"> "${WEBCORE_DIR}/xml/parser"
</span><del>- "${JAVASCRIPTCORE_DIR}"
- "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
- "${JAVASCRIPTCORE_DIR}/API"
- "${JAVASCRIPTCORE_DIR}/assembler"
- "${JAVASCRIPTCORE_DIR}/bytecode"
- "${JAVASCRIPTCORE_DIR}/bytecompiler"
- "${JAVASCRIPTCORE_DIR}/dfg"
- "${JAVASCRIPTCORE_DIR}/disassembler"
- "${JAVASCRIPTCORE_DIR}/heap"
- "${JAVASCRIPTCORE_DIR}/debugger"
- "${JAVASCRIPTCORE_DIR}/interpreter"
- "${JAVASCRIPTCORE_DIR}/jit"
- "${JAVASCRIPTCORE_DIR}/llint"
- "${JAVASCRIPTCORE_DIR}/parser"
- "${JAVASCRIPTCORE_DIR}/profiler"
- "${JAVASCRIPTCORE_DIR}/runtime"
- "${JAVASCRIPTCORE_DIR}/yarr"
- "${WTF_DIR}"
</del><span class="cx"> "${DERIVED_SOURCES_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
</span><del>- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
</del><span class="cx"> "${DERIVED_SOURCES_WEBCORE_DIR}"
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source"
</span><span class="cx"> "${CMAKE_BINARY_DIR}"
</span><span class="lines">@@ -3640,6 +3620,10 @@
</span><span class="cx"> ADD_TARGET_PROPERTIES(WebCore COMPILE_FLAGS "-fno-tree-sra")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (WebCore_POST_BUILD_COMMAND)
+ add_custom_command(TARGET WebCore POST_BUILD COMMAND ${WebCore_POST_BUILD_COMMAND} VERBATIM)
+endif ()
+
</ins><span class="cx"> if (WebCore_OUTPUT_NAME)
</span><span class="cx"> set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
</span><span class="cx"> endif ()
</span><span class="lines">@@ -3676,10 +3660,6 @@
</span><span class="cx">
</span><span class="cx"> target_link_libraries(WebCore ${WebCore_LIBRARIES})
</span><span class="cx">
</span><del>-if (WebCore_OUTPUT_NAME)
- set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
-endif ()
-
</del><span class="cx"> if (SHARED_CORE)
</span><span class="cx"> set_target_properties(WebCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
</span><span class="cx"> install(TARGETS WebCore DESTINATION "${LIB_INSTALL_DIR}")
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WebCore/ChangeLog 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-08-19 Alex Christensen <achristensen@webkit.org>
+
+ CMake Windows build should not include files directly from other Source directories
+ https://bugs.webkit.org/show_bug.cgi?id=148198
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformWin.cmake:
+
</ins><span class="cx"> 2015-08-19 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Select validation does not correctly work when handling change event
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,4 +1,23 @@
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><ins>+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
+ "${JAVASCRIPTCORE_DIR}"
+ "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
+ "${JAVASCRIPTCORE_DIR}/API"
+ "${JAVASCRIPTCORE_DIR}/assembler"
+ "${JAVASCRIPTCORE_DIR}/bytecode"
+ "${JAVASCRIPTCORE_DIR}/bytecompiler"
+ "${JAVASCRIPTCORE_DIR}/dfg"
+ "${JAVASCRIPTCORE_DIR}/disassembler"
+ "${JAVASCRIPTCORE_DIR}/heap"
+ "${JAVASCRIPTCORE_DIR}/debugger"
+ "${JAVASCRIPTCORE_DIR}/interpreter"
+ "${JAVASCRIPTCORE_DIR}/jit"
+ "${JAVASCRIPTCORE_DIR}/llint"
+ "${JAVASCRIPTCORE_DIR}/parser"
+ "${JAVASCRIPTCORE_DIR}/profiler"
+ "${JAVASCRIPTCORE_DIR}/runtime"
+ "${JAVASCRIPTCORE_DIR}/yarr"
</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 class="lines">@@ -24,6 +43,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/soup"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/efl"
</span><span class="cx"> "${WEBCORE_DIR}/plugins/efl"
</span><ins>+ "${WTF_DIR}"
</ins><span class="cx"> "${WTF_DIR}/wtf/efl"
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,6 +1,25 @@
</span><span class="cx"> set(WebCore_OUTPUT_NAME WebCoreGTK)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><ins>+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
+ "${JAVASCRIPTCORE_DIR}"
+ "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
+ "${JAVASCRIPTCORE_DIR}/API"
+ "${JAVASCRIPTCORE_DIR}/assembler"
+ "${JAVASCRIPTCORE_DIR}/bytecode"
+ "${JAVASCRIPTCORE_DIR}/bytecompiler"
+ "${JAVASCRIPTCORE_DIR}/dfg"
+ "${JAVASCRIPTCORE_DIR}/disassembler"
+ "${JAVASCRIPTCORE_DIR}/heap"
+ "${JAVASCRIPTCORE_DIR}/debugger"
+ "${JAVASCRIPTCORE_DIR}/interpreter"
+ "${JAVASCRIPTCORE_DIR}/jit"
+ "${JAVASCRIPTCORE_DIR}/llint"
+ "${JAVASCRIPTCORE_DIR}/parser"
+ "${JAVASCRIPTCORE_DIR}/profiler"
+ "${JAVASCRIPTCORE_DIR}/runtime"
+ "${JAVASCRIPTCORE_DIR}/yarr"
</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 class="lines">@@ -24,6 +43,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/gtk"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/soup"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/gtk"
</span><ins>+ "${WTF_DIR}"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,6 +1,25 @@
</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/JavaScriptCore"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/ForwardingHeaders"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/API"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/assembler"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/bytecode"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/bytecompiler"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/dfg"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/disassembler"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/heap"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/debugger"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/interpreter"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/jit"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/llint"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/parser"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/profiler"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/runtime"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/yarr"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF"
+ "${WEBCORE_DIR}/ForwardingHeaders"
</ins><span class="cx"> "${WEBCORE_DIR}/accessibility/win"
</span><span class="cx"> "${WEBCORE_DIR}/page/win"
</span><span class="cx"> "${WEBCORE_DIR}/platform/cf"
</span><span class="lines">@@ -132,6 +151,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCore_FORWARDING_HEADERS_DIRECTORIES
</span><ins>+ .
</ins><span class="cx"> accessibility
</span><span class="cx"> bindings
</span><span class="cx"> bridge
</span><span class="lines">@@ -147,6 +167,7 @@
</span><span class="cx"> plugins
</span><span class="cx"> rendering
</span><span class="cx"> storage
</span><ins>+ style
</ins><span class="cx"> svg
</span><span class="cx"> websockets
</span><span class="cx"> workers
</span><span class="lines">@@ -169,6 +190,8 @@
</span><span class="cx">
</span><span class="cx"> html/forms
</span><span class="cx"> html/parser
</span><ins>+ html/shadow
+ html/track
</ins><span class="cx">
</span><span class="cx"> loader/appcache
</span><span class="cx"> loader/archive
</span><span class="lines">@@ -178,9 +201,11 @@
</span><span class="cx"> loader/archive/cf
</span><span class="cx">
</span><span class="cx"> page/animation
</span><ins>+ page/scrolling
</ins><span class="cx"> page/win
</span><span class="cx">
</span><span class="cx"> platform/animation
</span><ins>+ platform/audio
</ins><span class="cx"> platform/cf
</span><span class="cx"> platform/graphics
</span><span class="cx"> platform/mock
</span><span class="lines">@@ -191,6 +216,7 @@
</span><span class="cx">
</span><span class="cx"> platform/cf/win
</span><span class="cx">
</span><ins>+ platform/graphics/filters
</ins><span class="cx"> platform/graphics/opengl
</span><span class="cx"> platform/graphics/opentype
</span><span class="cx"> platform/graphics/texmap
</span><span class="lines">@@ -199,6 +225,8 @@
</span><span class="cx">
</span><span class="cx"> platform/text/transcoder
</span><span class="cx">
</span><ins>+ rendering/line
+ rendering/shapes
</ins><span class="cx"> rendering/style
</span><span class="cx"> rendering/svg
</span><span class="cx">
</span><span class="lines">@@ -215,8 +243,6 @@
</span><span class="cx"> include(PlatformAppleWin.cmake)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
-
</del><span class="cx"> # FIXME: This should test if AVF headers are available.
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=135861
</span><span class="cx"> add_custom_command(
</span><span class="lines">@@ -233,6 +259,24 @@
</span><span class="cx"> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore)
+
+foreach (_directory ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
+ file(GLOB _files "${WEBCORE_DIR}/${_directory}/*.h")
+ foreach (_file ${_files})
+ file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore")
+ endforeach ()
+endforeach ()
+
+# These forwarding headers need to keep their directory structure.
+set(WebCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/postBuild.cmd")
+file(WRITE "${WebCore_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
+
+file(GLOB_RECURSE _files "${WEBCORE_DIR}/ForwardingHeaders/*.h")
+foreach (_file ${_files})
+ file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore")
+endforeach ()
+
</ins><span class="cx"> set(WebCore_OUTPUT_NAME
</span><span class="cx"> WebCore${DEBUG_SUFFIX}
</span><span class="cx"> )
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -12,9 +12,6 @@
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
</span><del>- "${JAVASCRIPTCORE_DIR}"
- "${JAVASCRIPTCORE_DIR}/disassembler"
- "${WTF_DIR}"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit_SYSTEM_INCLUDE_DIRECTORIES "")
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WebKit/ChangeLog 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-19 Alex Christensen <achristensen@webkit.org>
+
+ CMake Windows build should not include files directly from other Source directories
+ https://bugs.webkit.org/show_bug.cgi?id=148198
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+
</ins><span class="cx"> 2015-08-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Replace MIDL [in/out] comments with equivalent SAL
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> PRIVATE CoreText${DEBUG_SUFFIX}
</span><span class="cx"> PRIVATE CoreVideo${DEBUG_SUFFIX}
</span><span class="cx"> PRIVATE MediaAccessibility${DEBUG_SUFFIX}
</span><del>- PRIVATE MediaToolbox${DEBUG_SUFFIX}
</del><span class="cx"> PRIVATE QuartzCore${DEBUG_SUFFIX}
</span><span class="cx"> PRIVATE SQLite3${DEBUG_SUFFIX}
</span><span class="cx"> PRIVATE WebKitSystemInterface${DEBUG_SUFFIX}
</span><span class="lines">@@ -54,34 +53,10 @@
</span><span class="cx"> win/WebCoreSupport
</span><span class="cx"> WebCoreSupport
</span><span class="cx"> WebKit.vcxproj/WebKit
</span><ins>+ "${WEBKIT_DIR}/.."
</ins><span class="cx"> "${DERIVED_SOURCES_WEBKIT_DIR}/include"
</span><del>- "${CMAKE_SOURCE_DIR}/Source"
- "${DERIVED_SOURCES_WEBKIT_DIR}/include/WebCore"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_WEBCORE_DIR}"
- "${DERIVED_SOURCES_DIR}"
- "${JAVASCRIPTCORE_DIR}/dfg"
- "${WEBCORE_DIR}/style"
- "${WEBCORE_DIR}/loader/archive"
- "${WEBCORE_DIR}/loader/archive/cf"
- "${WEBCORE_DIR}/page/scrolling"
- "${WEBCORE_DIR}/platform/cf"
- "${WEBCORE_DIR}/platform/graphics/win"
- "${WEBCORE_DIR}/platform/graphics/filters"
- "${WEBCORE_DIR}/platform/audio"
- "${WEBCORE_DIR}/platform/win"
- "${WEBCORE_DIR}/rendering/line"
- "${WEBCORE_DIR}/rendering/shapes"
- "${WEBCORE_DIR}/html/shadow"
- "${WEBCORE_DIR}/html/track"
- "${WEBCORE_DIR}/modules/websockets"
</del><span class="cx"> "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
</span><del>- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
- "${THIRDPARTY_DIR}"
- "${THIRDPARTY_DIR}/ANGLE"
- "${THIRDPARTY_DIR}/ANGLE/include"
- "${THIRDPARTY_DIR}/ANGLE/include/egl"
- "${THIRDPARTY_DIR}/ANGLE/include/khr"
</del><ins>+ "${DERIVED_SOURCES_DIR}"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDES
</span><span class="lines">@@ -480,10 +455,7 @@
</span><span class="cx"> file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces)
</span><span class="cx">
</span><del>-set(WebKit_FORWARDING_HEADERS
- "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h"
- "${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h"
- "win/CFDictionaryPropertyBag.h"
-)
-
-WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit_FORWARDING_HEADERS})
</del><ins>+set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")
+file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n")
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit)
+add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
</ins></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-19 Alex Christensen <achristensen@webkit.org>
+
+ CMake Windows build should not include files directly from other Source directories
+ https://bugs.webkit.org/show_bug.cgi?id=148198
+
+ Reviewed by Brent Fulgham.
+
+ * WebKitPrefix.h:
+ Include cmakeconfig.h to properly define all enabled features.
+
</ins><span class="cx"> 2015-08-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Replace MIDL [in/out] comments with equivalent SAL
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitPrefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitPrefix.h (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitPrefix.h 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/WebKit/win/WebKitPrefix.h 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -43,6 +43,10 @@
</span><span class="cx"> #define __STDC_LIMIT_MACROS
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
+#include "cmakeconfig.h"
+#endif
+
</ins><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #include <WebKit/WebKit.h>
</span><span class="cx"> #include "config.h"
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Source/cmake/WebKitMacros.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -244,35 +244,38 @@
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><span class="cx"> macro(WEBKIT_CREATE_FORWARDING_HEADERS _framework)
</span><del>- set(_processing_directories 0)
- set(_processing_files 0)
- set(_target_directory "${DERIVED_SOURCES_DIR}/ForwardingHeaders/${_framework}")
</del><ins>+ # On Windows, we copy the entire contents of forwarding headers.
+ if (NOT WIN32)
+ set(_processing_directories 0)
+ set(_processing_files 0)
+ set(_target_directory "${DERIVED_SOURCES_DIR}/ForwardingHeaders/${_framework}")
</ins><span class="cx">
</span><del>- file(GLOB _files "${_target_directory}/*.h")
- foreach (_file ${_files})
- file(READ "${_file}" _content)
- string(REGEX MATCH "^#include \"([^\"]*)\"" _matched ${_content})
- if (_matched AND NOT EXISTS "${CMAKE_SOURCE_DIR}/Source/${CMAKE_MATCH_1}")
- file(REMOVE "${_file}")
- endif ()
- endforeach ()
</del><ins>+ file(GLOB _files "${_target_directory}/*.h")
+ foreach (_file ${_files})
+ file(READ "${_file}" _content)
+ string(REGEX MATCH "^#include \"([^\"]*)\"" _matched ${_content})
+ if (_matched AND NOT EXISTS "${CMAKE_SOURCE_DIR}/Source/${CMAKE_MATCH_1}")
+ file(REMOVE "${_file}")
+ endif ()
+ endforeach ()
</ins><span class="cx">
</span><del>- foreach (_currentArg ${ARGN})
- if ("${_currentArg}" STREQUAL "DIRECTORIES")
- set(_processing_directories 1)
- set(_processing_files 0)
- elseif ("${_currentArg}" STREQUAL "FILES")
- set(_processing_directories 0)
- set(_processing_files 1)
- elseif (_processing_directories)
- file(GLOB _files "${_currentArg}/*.h")
- foreach (_file ${_files})
- WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_file})
- endforeach ()
- elseif (_processing_files)
- WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_currentArg})
- endif ()
- endforeach ()
</del><ins>+ foreach (_currentArg ${ARGN})
+ if ("${_currentArg}" STREQUAL "DIRECTORIES")
+ set(_processing_directories 1)
+ set(_processing_files 0)
+ elseif ("${_currentArg}" STREQUAL "FILES")
+ set(_processing_directories 0)
+ set(_processing_files 1)
+ elseif (_processing_directories)
+ file(GLOB _files "${_currentArg}/*.h")
+ foreach (_file ${_files})
+ WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_file})
+ endforeach ()
+ elseif (_processing_files)
+ WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_currentArg})
+ endif ()
+ endforeach ()
+ endif ()
</ins><span class="cx"> endmacro()
</span><span class="cx">
</span><span class="cx"> # Helper macro which wraps generate-message-receiver.py and generate-message-header.py scripts
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Tools/ChangeLog 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-08-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ CMake Windows build should not include files directly from other Source directories
+ https://bugs.webkit.org/show_bug.cgi?id=148198
+
+ Reviewed by Brent Fulgham.
+
+ * DumpRenderTree/DumpRenderTreePrefix.h:
+ Include cmakeconfig.h to properly define all enabled features.
+ * DumpRenderTree/PlatformWin.cmake:
+ * TestWebKitAPI/PlatformWin.cmake:
+
+2015-08-19 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Build TestWTF on Mac with CMake.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147972
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreePrefixh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -26,6 +26,10 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
+#include "cmakeconfig.h"
+#endif
+
</ins><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> TestNetscapePlugin/Tests
</span><span class="cx"> TestNetscapePlugin/win
</span><span class="cx"> TestNetscapePlugin/Tests/win
</span><ins>+ ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND DumpRenderTree_LIBRARIES
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (188672 => 188673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-20 00:55:10 UTC (rev 188672)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-20 00:56:23 UTC (rev 188673)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> ${DERIVED_SOURCES_DIR}
</span><span class="cx"> ${DERIVED_SOURCES_DIR}/ForwardingHeaders
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/win
</span><ins>+ ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_definitions(-DWEBCORE_EXPORT=)
</span><span class="lines">@@ -49,9 +50,27 @@
</span><span class="cx"> )
</span><span class="cx"> else ()
</span><span class="cx"> list(APPEND test_webcore_LIBRARIES
</span><del>- CFNetwork
- CoreMedia
- WebKitSystemInterface
</del><ins>+ ASL${DEBUG_SUFFIX}
+ AVFoundationCF${DEBUG_SUFFIX}
+ CFNetwork${DEBUG_SUFFIX}
+ CoreAudioToolbox${DEBUG_SUFFIX}
+ CoreFoundation${DEBUG_SUFFIX}
+ CoreGraphics${DEBUG_SUFFIX}
+ CoreMedia${DEBUG_SUFFIX}
+ CoreText${DEBUG_SUFFIX}
+ CoreVideo${DEBUG_SUFFIX}
+ MediaAccessibility${DEBUG_SUFFIX}
+ QuartzCore${DEBUG_SUFFIX}
+ SQLite3${DEBUG_SUFFIX}
+ WebKitSystemInterface${DEBUG_SUFFIX}
+ WebKitQuartzCoreAdditions${DEBUG_SUFFIX}
+ libdispatch${DEBUG_SUFFIX}
+ libexslt${DEBUG_SUFFIX}
+ libicuin${DEBUG_SUFFIX}
+ libicuuc${DEBUG_SUFFIX}
+ libxml2${DEBUG_SUFFIX}
+ libxslt${DEBUG_SUFFIX}
+ zdll${DEBUG_SUFFIX}
</ins><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>