<!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>[189056] 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/189056">189056</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-08-27 14:36:49 -0700 (Thu, 27 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Isolate Source directories in CMake build
https://bugs.webkit.org/show_bug.cgi?id=148389
Reviewed by Brent Fulgham.
.:
* CMakeLists.txt:
* Source/cmake/WebKitCommon.cmake:
Move package finding to WebKitCommon.
Source/JavaScriptCore:
* PlatformWin.cmake:
Include ../include/private to find WTF headers in internal build.
Don't use a script to generate forwarding headers.
* shell/PlatformWin.cmake:
Copy inspector scripts to the forwarding headers directory to be used by WebCore.
Source/WebCore:
* CMakeLists.txt:
Use the forwarding header copy of the inspector scripts to avoid requiring JavaScriptCore directory to exist.
* PlatformAppleWin.cmake:
Add AVFoundation sources to build.
* PlatformEFL.cmake:
Moved WebKitVersion.h generating from CMakeLists.txt because it is now only used in WebCore by EFL.
* PlatformWin.cmake:
Include ../include/private to find forwarding headers in internal build.
Source/WebKit:
* PlatformWin.cmake:
Moved WebKitVersion.h generation from WebCore because the scripts required for it are in WebKit.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformWincmake">trunk/Source/JavaScriptCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceJavaScriptCoreshellPlatformWincmake">trunk/Source/JavaScriptCore/shell/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="#trunkSourceWebCorePlatformAppleWincmake">trunk/Source/WebCore/PlatformAppleWin.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.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="#trunkSourcecmakeWebKitCommoncmake">trunk/Source/cmake/WebKitCommon.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/CMakeLists.txt 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -30,30 +30,6 @@
</span><span class="cx"> string(TOLOWER ${PORT} WEBKIT_PORT_DIR)
</span><span class="cx">
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-# Find common packages (used by all ports)
-# -----------------------------------------------------------------------------
-find_package(BISON 2.3 REQUIRED)
-if (!APPLE)
- find_package(FLEX 2.5.34 REQUIRED)
-endif ()
-
-# TODO Enforce version requirement for gperf
-find_package(Gperf 3.0.1 REQUIRED)
-
-# TODO Enforce version requirement for perl
-find_package(Perl 5.10.0 REQUIRED)
-
-find_package(PythonInterp 2.7.0 REQUIRED)
-
-# We cannot check for RUBY_FOUND because it is set only when the full package is installed and
-# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
-# for finding only the Ruby interpreter.
-find_package(Ruby 1.8.7)
-if (NOT RUBY_EXECUTABLE OR RUBY_VERSION VERSION_LESS 1.8.7)
- message(FATAL_ERROR "Ruby 1.8.7 or higher is required.")
-endif ()
-
-# -----------------------------------------------------------------------------
</del><span class="cx"> # Determine the target processor
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> # Use MSVC_CXX_ARCHITECTURE_ID instead of CMAKE_SYSTEM_PROCESSOR when defined,
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/ChangeLog 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-08-27 Alex Christensen <achristensen@webkit.org>
+
+ Isolate Source directories in CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=148389
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * Source/cmake/WebKitCommon.cmake:
+ Move package finding to WebKitCommon.
+
</ins><span class="cx"> 2015-08-26 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win] Build does not generate debug info.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-08-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Isolate Source directories in CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=148389
+
+ Reviewed by Brent Fulgham.
+
+ * PlatformWin.cmake:
+ Include ../include/private to find WTF headers in internal build.
+ Don't use a script to generate forwarding headers.
+ * shell/PlatformWin.cmake:
+ Copy inspector scripts to the forwarding headers directory to be used by WebCore.
+
+2015-08-27 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> [Win CMake] Fix incremental build after r188673
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148539
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformWin.cmake (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformWin.cmake 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/JavaScriptCore/PlatformWin.cmake 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -3,6 +3,10 @@
</span><span class="cx"> API/JSStringRefCF.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+ ${CMAKE_BINARY_DIR}/../include/private
+)
+
</ins><span class="cx"> if (WTF_PLATFORM_WIN_CAIRO)
</span><span class="cx"> list(APPEND JavaScriptCore_LIBRARIES
</span><span class="cx"> CFLite
</span><span class="lines">@@ -14,17 +18,6 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (MSVC AND "${JavaScriptCore_LIBRARY_TYPE}" MATCHES "SHARED")
- get_property(WTF_LIBRARY_LOCATION TARGET WTF PROPERTY LOCATION)
-
- add_custom_command(
- OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/forwarded-exports.cpp
- DEPENDS WTF
- COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/Scripts/generate-win32-export-forwards ${WTF_LIBRARY_LOCATION} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/forwarded-exports.cpp
- VERBATIM)
- list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/forwarded-exports.cpp)
-endif ()
-
</del><span class="cx"> list(REMOVE_ITEM JavaScriptCore_SOURCES
</span><span class="cx"> inspector/JSGlobalObjectInspectorController.cpp
</span><span class="cx"> )
</span><span class="lines">@@ -39,6 +32,7 @@
</span><span class="cx"> set(JavaScriptCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/postBuild.cmd")
</span><span class="cx"> file(WRITE "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
</span><span class="cx"> file(APPEND "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
</span><ins>+file(APPEND "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f /s \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/scripts/*.*\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
</ins><span class="cx"> foreach (_directory ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES})
</span><span class="cx"> file(APPEND "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${JAVASCRIPTCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
</span><span class="cx"> endforeach ()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreshellPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/shell/PlatformWin.cmake (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/shell/PlatformWin.cmake 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/JavaScriptCore/shell/PlatformWin.cmake 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -1,5 +1,10 @@
</span><span class="cx"> include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
</span><span class="cx"> add_library(jscdll SHARED ${JSC_SOURCES})
</span><ins>+
+list(APPEND JSC_LIBRARIES
+ Winmm
+)
+
</ins><span class="cx"> target_link_libraries(jscdll ${JSC_LIBRARIES})
</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="lines">@@ -8,7 +13,7 @@
</span><span class="cx"> add_definitions(-DWIN_CAIRO)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-set(JSC_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
</del><ins>+set(JSC_SOURCES ${JAVASCRIPTCORE_DIR}/JavaScriptCore.vcxproj/jsc/DLLLauncherMain.cpp)
</ins><span class="cx"> set(JSC_LIBRARIES shlwapi)
</span><span class="cx"> add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -814,7 +814,15 @@
</span><span class="cx"> ${WebCore_SVG_IDL_FILES}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(WebCore_INSPECTOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
</del><ins>+if (WIN32)
+ if (INTERNAL_BUILD)
+ set(WebCore_INSPECTOR_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore")
+ else ()
+ set(WebCore_INSPECTOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
+ endif ()
+else ()
+ set(WebCore_INSPECTOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
+endif ()
</ins><span class="cx">
</span><span class="cx"> set(WebCore_SOURCES
</span><span class="cx"> Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp
</span><span class="lines">@@ -3579,16 +3587,6 @@
</span><span class="cx"> GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp)
</span><span class="cx">
</span><del>-if (NOT PORT STREQUAL "GTK")
- add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
- MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
- DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
- VERBATIM)
- list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
-endif ()
-
</del><span class="cx"> WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
</span><span class="cx"> WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/WebCore/ChangeLog 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-08-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Isolate Source directories in CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=148389
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ Use the forwarding header copy of the inspector scripts to avoid requiring JavaScriptCore directory to exist.
+ * PlatformAppleWin.cmake:
+ Add AVFoundation sources to build.
+ * PlatformEFL.cmake:
+ Moved WebKitVersion.h generating from CMakeLists.txt because it is now only used in WebCore by EFL.
+ * PlatformWin.cmake:
+ Include ../include/private to find forwarding headers in internal build.
+
+2015-08-27 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> [Win CMake] Fix incremental build after r188673
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148539
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformAppleWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformAppleWin.cmake (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformAppleWin.cmake 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/WebCore/PlatformAppleWin.cmake 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> "${WEBKIT_LIBRARIES_DIR}/include"
</span><span class="cx"> "${WEBKIT_LIBRARIES_DIR}/include/zlib"
</span><span class="cx"> "${WEBCORE_DIR}/loader/archive/cf"
</span><ins>+ "${WEBCORE_DIR}/platform/graphics/avfoundation"
+ "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/graphics/ca"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/ca/win"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/cg"
</span><span class="lines">@@ -20,6 +22,18 @@
</span><span class="cx"> platform/cf/CFURLExtras.cpp
</span><span class="cx"> platform/cf/URLCF.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp
+ platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
+ platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
+ platform/graphics/avfoundation/MediaTimeAVFoundation.cpp
+ platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp
+
+ platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp
+ platform/graphics/avfoundation/cf/ImbandTextTrackPrivateLegacyAVCF.cpp
+ platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp
+ platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp
+ platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp
+
</ins><span class="cx"> platform/graphics/ca/GraphicsLayerCA.cpp
</span><span class="cx"> platform/graphics/ca/LayerFlushScheduler.cpp
</span><span class="cx"> platform/graphics/ca/LayerPool.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -314,6 +314,14 @@
</span><span class="cx"> ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsBase.js
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
+ MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
+ DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
+ VERBATIM)
+list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
+
</ins><span class="cx"> set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/efl/RenderThemeEfl.cpp)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_LIBRARIES
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-08-27 21:36:49 UTC (rev 189056)
</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>+ "${CMAKE_BINARY_DIR}/../include/private"
+ "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
</ins><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/KHR"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/WebKit/ChangeLog 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-27 Alex Christensen <achristensen@webkit.org>
+
+ Isolate Source directories in CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=148389
+
+ Reviewed by Brent Fulgham.
+
+ * PlatformWin.cmake:
+ Moved WebKitVersion.h generation from WebCore because the scripts required for it are in WebKit.
+
</ins><span class="cx"> 2015-08-27 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Factor out Lookup invocation
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -46,7 +46,18 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitVersion.h
+ MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
+ DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBKIT_DIR}
+ VERBATIM)
+list(APPEND WebKit_SOURCES ${DERIVED_SOURCES_WEBKIT_DIR}/WebKitVersion.h)
+
</ins><span class="cx"> list(APPEND WebKit_INCLUDE_DIRECTORIES
</span><ins>+ "${CMAKE_BINARY_DIR}/../include/private"
+ "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
+ "${CMAKE_BINARY_DIR}/../include/private/WebCore"
</ins><span class="cx"> Storage
</span><span class="cx"> win
</span><span class="cx"> win/plugins
</span><span class="lines">@@ -61,6 +72,7 @@
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr"
</span><ins>+ "${DERIVED_SOURCES_DIR}/WebKit"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDES
</span><span class="lines">@@ -384,7 +396,7 @@
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/autoversion.h
</span><span class="cx"> WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
</span><del>- COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/WebKitLibraries/win/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKIT_DIR}
</del><ins>+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKIT_DIR}
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> GENERATE_INTERFACE(win/Interfaces/WebKit.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
</span><span class="lines">@@ -442,6 +454,8 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+set(WebKit_LIBRARY_TYPE SHARED)
+
</ins><span class="cx"> # We need the webkit libraries to come before the system default libraries to prevent symbol conflicts with uuid.lib.
</span><span class="cx"> # To do this we add system default libs as webkit libs and zero out system default libs.
</span><span class="cx"> string(REPLACE " " "\;" CXX_LIBS ${CMAKE_CXX_STANDARD_LIBRARIES})
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitCommoncmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitCommon.cmake (189055 => 189056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitCommon.cmake 2015-08-27 21:31:43 UTC (rev 189055)
+++ trunk/Source/cmake/WebKitCommon.cmake 2015-08-27 21:36:49 UTC (rev 189056)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+# -----------------------------------------------------------------------------
+# Find common packages (used by all ports)
+# -----------------------------------------------------------------------------
+find_package(BISON 2.3 REQUIRED)
+if (!APPLE)
+ find_package(FLEX 2.5.34 REQUIRED)
+endif ()
+
+# TODO Enforce version requirement for gperf
+find_package(Gperf 3.0.1 REQUIRED)
+
+# TODO Enforce version requirement for perl
+find_package(Perl 5.10.0 REQUIRED)
+
+find_package(PythonInterp 2.7.0 REQUIRED)
+
+# We cannot check for RUBY_FOUND because it is set only when the full package is installed and
+# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
+# for finding only the Ruby interpreter.
+find_package(Ruby 1.8.7)
+if (NOT RUBY_EXECUTABLE OR RUBY_VERSION VERSION_LESS 1.8.7)
+ message(FATAL_ERROR "Ruby 1.8.7 or higher is required.")
+endif ()
+
</ins><span class="cx"> include(WebKitMacros)
</span><span class="cx"> include(WebKitFS)
</span><span class="cx"> include(WebKitHelpers)
</span></span></pre>
</div>
</div>
</body>
</html>