<!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>[209665] 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/209665">209665</a></dd>
<dt>Author</dt> <dd>annulen@yandex.ru</dd>
<dt>Date</dt> <dd>2016-12-10 10:16:04 -0800 (Sat, 10 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
https://bugs.webkit.org/show_bug.cgi?id=165686
Reviewed by Michael Catanzaro.
This change reduces duplication of include path lists between modules,
and reduces future need for fixes like <a href="http://trac.webkit.org/projects/webkit/changeset/209605">r209605</a> (broken build because of
WebCore header suddenly becoming used in WebKit2).
.:
* Source/cmake/WebKitMacros.cmake:
Source/JavaScriptCore:
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformJSCOnly.cmake:
* PlatformMac.cmake:
Source/ThirdParty:
* gtest/CMakeLists.txt:
Source/WebCore:
No new tests needed.
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWinCairo.cmake:
Source/WebKit:
* CMakeLists.txt:
* PlatformMac.cmake:
* PlatformWin.cmake:
Source/WebKit2:
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
Tools:
* DumpRenderTree/CMakeLists.txt:
* DumpRenderTree/PlatformMac.cmake:
* ImageDiff/CMakeLists.txt:
* MiniBrowser/gtk/CMakeLists.txt:
* MiniBrowser/mac/CMakeLists.txt:
* MiniBrowser/win/CMakeLists.txt:
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/PlatformEfl.cmake:
* TestWebKitAPI/PlatformJSCOnly.cmake:
* TestWebKitAPI/PlatformMac.cmake:
* TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt:
* WebKitTestRunner/CMakeLists.txt:
* WebKitTestRunner/PlatformGTK.cmake:
* WebKitTestRunner/PlatformMac.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="#trunkSourceJavaScriptCorePlatformJSCOnlycmake">trunk/Source/JavaScriptCore/PlatformJSCOnly.cmake</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformMaccmake">trunk/Source/JavaScriptCore/PlatformMac.cmake</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="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWinCairocmake">trunk/Source/WebCore/PlatformWinCairo.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="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</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="#trunkToolsDumpRenderTreeCMakeListstxt">trunk/Tools/DumpRenderTree/CMakeLists.txt</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformMaccmake">trunk/Tools/DumpRenderTree/PlatformMac.cmake</a></li>
<li><a href="#trunkToolsImageDiffCMakeListstxt">trunk/Tools/ImageDiff/CMakeLists.txt</a></li>
<li><a href="#trunkToolsMiniBrowsergtkCMakeListstxt">trunk/Tools/MiniBrowser/gtk/CMakeLists.txt</a></li>
<li><a href="#trunkToolsMiniBrowsermacCMakeListstxt">trunk/Tools/MiniBrowser/mac/CMakeLists.txt</a></li>
<li><a href="#trunkToolsMiniBrowserwinCMakeListstxt">trunk/Tools/MiniBrowser/win/CMakeLists.txt</a></li>
<li><a href="#trunkToolsTestWebKitAPICMakeListstxt">trunk/Tools/TestWebKitAPI/CMakeLists.txt</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformEflcmake">trunk/Tools/TestWebKitAPI/PlatformEfl.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformJSCOnlycmake">trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformMaccmake">trunk/Tools/TestWebKitAPI/PlatformMac.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkCMakeListstxt">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt</a></li>
<li><a href="#trunkToolsWebKitTestRunnerCMakeListstxt">trunk/Tools/WebKitTestRunner/CMakeLists.txt</a></li>
<li><a href="#trunkToolsWebKitTestRunnerPlatformGTKcmake">trunk/Tools/WebKitTestRunner/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsWebKitTestRunnerPlatformMaccmake">trunk/Tools/WebKitTestRunner/PlatformMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-12-10 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * Source/cmake/WebKitMacros.cmake:
+
</ins><span class="cx"> 2016-11-30 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Apple build is using incorrect ICU library (if present)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -3,7 +3,6 @@
</span><span class="cx"> set_property(DIRECTORY . PROPERTY FOLDER "JavaScriptCore")
</span><span class="cx">
</span><span class="cx"> set(JavaScriptCore_INCLUDE_DIRECTORIES
</span><del>- "${CMAKE_BINARY_DIR}"
</del><span class="cx"> "${JAVASCRIPTCORE_DIR}"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/.."
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/API"
</span><span class="lines">@@ -37,7 +36,6 @@
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/wasm"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/wasm/js"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/yarr"
</span><del>- "${DERIVED_SOURCES_DIR}"
</del><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><span class="lines">@@ -1476,6 +1474,7 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(JavaScriptCore DIRECTORIES ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${JavaScriptCore_FORWARDING_HEADERS_FILES})
</span><span class="cx">
</span><ins>+target_include_directories(LLIntOffsetsExtractor PRIVATE ${JavaScriptCore_INCLUDE_DIRECTORIES})
</ins><span class="cx">
</span><span class="cx"> add_subdirectory(shell)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-12-10 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformJSCOnly.cmake:
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2016-12-10 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for the CLOOP after r209653
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformEfl.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformEfl.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/JavaScriptCore/PlatformEfl.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,8 +1,3 @@
</span><del>-list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
- "${WTF_DIR}"
- "${WTF_DIR}/wtf/efl"
-)
-
</del><span class="cx"> list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
</span><span class="cx"> ${ECORE_EVAS_INCLUDE_DIRS}
</span><span class="cx"> ${ECORE_IMF_INCLUDE_DIRS}
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformGTK.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformGTK.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/JavaScriptCore/PlatformGTK.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,9 +1,5 @@
</span><span class="cx"> set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
</span><span class="cx">
</span><del>-list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
- "${WTF_DIR}"
-)
-
</del><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="trunkSourceJavaScriptCorePlatformJSCOnlycmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformJSCOnly.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformJSCOnly.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/JavaScriptCore/PlatformJSCOnly.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,9 +1,5 @@
</span><span class="cx"> add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
</span><span class="cx">
</span><del>-list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
- "${WTF_DIR}"
-)
-
</del><span class="cx"> if (USE_GLIB)
</span><span class="cx"> list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
</span><span class="cx"> ${GLIB_INCLUDE_DIRS}
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
</span><del>- ${WTF_DIR}
</del><span class="cx"> ${JAVASCRIPTCORE_DIR}/disassembler/udis86
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/icu
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceThirdPartyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ChangeLog (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/ThirdParty/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-12-10 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * gtest/CMakeLists.txt:
+
</ins><span class="cx"> 2016-12-06 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Correct SDKROOT values in xcconfig files
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/ThirdParty/gtest/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -9,9 +9,7 @@
</span><span class="cx"> "${GTEST_DIR}"
</span><span class="cx"> "${GTEST_DIR}/include"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}"
</span><del>- "${DERIVED_SOURCES_DIR}"
</del><span class="cx"> "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
</span><del>- "${WTF_DIR}"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(GTEST_SOURCES
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -113,11 +113,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>- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
</del><span class="cx"> "${DERIVED_SOURCES_WEBCORE_DIR}"
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source"
</span><del>- "${CMAKE_BINARY_DIR}"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><span class="lines">@@ -3399,11 +3396,6 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEB_REPLAY)
</span><del>- list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${JAVASCRIPTCORE_DIR}/inspector"
- "${JAVASCRIPTCORE_DIR}/replay"
- )
-
</del><span class="cx"> set(WebCore_WEB_REPLAY_INPUTS ${CMAKE_CURRENT_SOURCE_DIR}/replay/WebInputs.json ${JAVASCRIPTCORE_DIR}/replay/JSInputs.json)
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.cpp
</span><span class="lines">@@ -3876,7 +3868,9 @@
</span><span class="cx"> # files on OS X.
</span><span class="cx"> add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
</span><span class="cx"> set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
</span><del>-add_dependencies(WebCoreDerivedSources JavaScriptCore WebCoreBindings)
</del><ins>+target_link_libraries(WebCoreDerivedSources ${WebCore_LIBRARIES})
+target_include_directories(WebCoreDerivedSources PUBLIC ${WebCore_INCLUDE_DIRECTORIES})
+add_dependencies(WebCoreDerivedSources WebCoreBindings)
</ins><span class="cx"> if (NOT WIN32)
</span><span class="cx"> list(APPEND WebCore_LIBRARIES WebCoreDerivedSources)
</span><span class="cx"> endif ()
</span><span class="lines">@@ -3905,9 +3899,9 @@
</span><span class="cx"> ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-include_directories(${WebCoreTestSupport_INCLUDE_DIRECTORIES})
</del><span class="cx"> add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
</span><span class="cx"> add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
</span><ins>+target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
</ins><span class="cx"> target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
</span><span class="cx">
</span><span class="cx"> if (WebCoreTestSupport_OUTPUT_NAME)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-12-10 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ No new tests needed.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * PlatformWinCairo.cmake:
+
</ins><span class="cx"> 2016-12-10 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Replace isUnclosedNode by isClosedShadowHidden
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -4,26 +4,6 @@
</span><span class="cx"> include(platform/TextureMapper.cmake)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><del>- "${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}/domjit"
- "${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"
</del><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/"
</span><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/include/KHR"
</span><span class="cx"> "${WEBCORE_DIR}/editing/atk"
</span><span class="lines">@@ -49,8 +29,6 @@
</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><del>- "${WTF_DIR}"
- "${WTF_DIR}/wtf/efl"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -9,26 +9,6 @@
</span><span class="cx"> set(WebCore_OUTPUT_NAME WebCoreGTK)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><del>- "${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}/domjit"
- "${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"
</del><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/"
</span><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/include/KHR"
</span><span class="cx"> "${WEBCORE_DIR}/accessibility/atk"
</span><span class="lines">@@ -56,7 +36,6 @@
</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><del>- "${WTF_DIR}"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="lines">@@ -379,7 +358,6 @@
</span><span class="cx"> include_directories(
</span><span class="cx"> ${WebCore_INCLUDE_DIRECTORIES}
</span><span class="cx"> "${WEBCORE_DIR}/bindings/gobject/"
</span><del>- "${DERIVED_SOURCES_DIR}"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> include_directories(SYSTEM
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -68,9 +68,6 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
</span><del>- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
- "${JAVASCRIPTCORE_DIR}/replay"
</del><span class="cx"> "${THIRDPARTY_DIR}/ANGLE"
</span><span class="cx"> "${THIRDPARTY_DIR}/ANGLE/include/KHR"
</span><span class="cx"> "${WEBCORE_DIR}/accessibility/mac"
</span><span class="lines">@@ -126,7 +123,6 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/spi/ios"
</span><span class="cx"> "${WEBCORE_DIR}/platform/spi/mac"
</span><span class="cx"> "${WEBCORE_DIR}/plugins/mac"
</span><del>- "${WTF_DIR}"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -8,7 +8,6 @@
</span><span class="cx"> "${WEBKIT_LIBRARIES_DIR}/include"
</span><span class="cx"> "${WEBKIT_LIBRARIES_DIR}/include/SQLite"
</span><span class="cx"> "${WEBKIT_LIBRARIES_DIR}/include/zlib"
</span><del>- "${JAVASCRIPTCORE_DIR}/wtf/text"
</del><span class="cx"> "${WEBCORE_DIR}/loader/archive/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/cairo"
</span></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -17,13 +17,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit_INCLUDE_DIRECTORIES
</span><del>- Storage
- WebCoreSupport
-
- "${CMAKE_BINARY_DIR}"
- "${CMAKE_SOURCE_DIR}/Source"
- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
</del><ins>+ "${WEBKIT_DIR}/Storage"
+ "${WEBKIT_DIR}/WebCoreSupport"
</ins><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></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-12-10 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+
</ins><span class="cx"> 2016-12-05 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed cmake buildfix after r209252.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -5,44 +5,7 @@
</span><span class="cx"> link_directories(../../WebKitLibraries)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDE_DIRECTORIES
</span><del>- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_WEBCORE_DIR}"
</del><span class="cx"> "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
</span><del>- "${JAVASCRIPTCORE_DIR}"
- "${JAVASCRIPTCORE_DIR}/dfg"
- "${WEBCORE_DIR}/accessibility/mac"
- "${WEBCORE_DIR}/bridge"
- "${WEBCORE_DIR}/bridge/jsc"
- "${WEBCORE_DIR}/bridge/objc"
- "${WEBCORE_DIR}/ForwardingHeaders/inspector"
- "${WEBCORE_DIR}/html/track"
- "${WEBCORE_DIR}/loader/archive/cf"
- "${WEBCORE_DIR}/loader/cf"
- "${WEBCORE_DIR}/loader/mac"
- "${WEBCORE_DIR}/page/cocoa"
- "${WEBCORE_DIR}/page/mac"
- "${WEBCORE_DIR}/platform"
- "${WEBCORE_DIR}/platform/cf"
- "${WEBCORE_DIR}/platform/cocoa"
- "${WEBCORE_DIR}/platform/graphics/avfoundation"
- "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
- "${WEBCORE_DIR}/platform/graphics/avfoundation/objc"
- "${WEBCORE_DIR}/platform/graphics/ca"
- "${WEBCORE_DIR}/platform/graphics/ca/mac"
- "${WEBCORE_DIR}/platform/graphics/cocoa"
- "${WEBCORE_DIR}/platform/graphics/cg"
- "${WEBCORE_DIR}/platform/graphics/opentype"
- "${WEBCORE_DIR}/platform/graphics/mac"
- "${WEBCORE_DIR}/platform/mac"
- "${WEBCORE_DIR}/platform/network/cocoa"
- "${WEBCORE_DIR}/platform/network/cf"
- "${WEBCORE_DIR}/platform/network/mac"
- "${WEBCORE_DIR}/platform/text/cf"
- "${WEBCORE_DIR}/platform/text/mac"
- "${WEBCORE_DIR}/plugins/mac"
- "${WEBCORE_DIR}/rendering/shapes"
- "${WTF_DIR}"
</del><span class="cx"> ../../WebKitLibraries
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit/PlatformWin.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -52,13 +52,11 @@
</span><span class="cx"> "${CMAKE_BINARY_DIR}/../include/private"
</span><span class="cx"> "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
</span><span class="cx"> "${CMAKE_BINARY_DIR}/../include/private/WebCore"
</span><del>- win
- win/plugins
- win/WebCoreSupport
- "${WEBKIT_DIR}/.."
</del><ins>+ "${WEBKIT_DIR}/win"
+ "${WEBKIT_DIR}/win/plugins"
+ "${WEBKIT_DIR}/win/WebCoreSupport"
</ins><span class="cx"> "${DERIVED_SOURCES_WEBKIT_DIR}/include"
</span><span class="cx"> "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
</span><del>- "${DERIVED_SOURCES_DIR}"
</del><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl"
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,7 +1,6 @@
</span><span class="cx"> set_property(DIRECTORY . PROPERTY FOLDER "WebKit2")
</span><span class="cx">
</span><span class="cx"> set(WebKit2_INCLUDE_DIRECTORIES
</span><del>- "${JAVASCRIPTCORE_DIR}/llint"
</del><span class="cx"> "${WEBKIT2_DIR}"
</span><span class="cx"> "${WEBKIT2_DIR}/DatabaseProcess"
</span><span class="cx"> "${WEBKIT2_DIR}/DatabaseProcess/IndexedDB"
</span><span class="lines">@@ -75,99 +74,8 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/UserContent"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage"
</span><del>- "${WEBCORE_DIR}"
- "${WEBCORE_DIR}/Modules/indexeddb"
- "${WEBCORE_DIR}/Modules/indexeddb/client"
- "${WEBCORE_DIR}/Modules/indexeddb/server"
- "${WEBCORE_DIR}/Modules/indexeddb/shared"
- "${WEBCORE_DIR}/Modules/mediastream"
- "${WEBCORE_DIR}/Modules/networkinfo"
- "${WEBCORE_DIR}/Modules/notifications"
- "${WEBCORE_DIR}/Modules/streams"
- "${WEBCORE_DIR}/Modules/vibration"
- "${WEBCORE_DIR}/Modules/webdatabase"
- "${WEBCORE_DIR}/accessibility"
- "${WEBCORE_DIR}/bindings/generic"
- "${WEBCORE_DIR}/bindings/js"
- "${WEBCORE_DIR}/bindings"
- "${WEBCORE_DIR}/bridge"
- "${WEBCORE_DIR}/bridge/jsc"
- "${WEBCORE_DIR}/contentextensions"
- "${WEBCORE_DIR}/crypto"
- "${WEBCORE_DIR}/crypto/algorithms"
- "${WEBCORE_DIR}/crypto/keys"
- "${WEBCORE_DIR}/crypto/parameters"
- "${WEBCORE_DIR}/css"
- "${WEBCORE_DIR}/css/parser"
- "${WEBCORE_DIR}/dom"
- "${WEBCORE_DIR}/dom/default"
- "${WEBCORE_DIR}/editing"
- "${WEBCORE_DIR}/fileapi"
- "${WEBCORE_DIR}/history"
- "${WEBCORE_DIR}/html"
- "${WEBCORE_DIR}/html/canvas"
- "${WEBCORE_DIR}/html/shadow"
- "${WEBCORE_DIR}/html/track"
- "${WEBCORE_DIR}/inspector"
- "${WEBCORE_DIR}/loader"
- "${WEBCORE_DIR}/loader/archive"
- "${WEBCORE_DIR}/loader/icon"
- "${WEBCORE_DIR}/loader/cache"
- "${WEBCORE_DIR}/page"
- "${WEBCORE_DIR}/page/animation"
- "${WEBCORE_DIR}/page/csp"
- "${WEBCORE_DIR}/page/scrolling"
- "${WEBCORE_DIR}/platform"
- "${WEBCORE_DIR}/platform/animation"
- "${WEBCORE_DIR}/platform/audio"
- "${WEBCORE_DIR}/platform/gamepad"
- "${WEBCORE_DIR}/platform/graphics"
- "${WEBCORE_DIR}/platform/graphics/filters"
- "${WEBCORE_DIR}/platform/graphics/harfbuzz"
- "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
- "${WEBCORE_DIR}/platform/graphics/surfaces"
- "${WEBCORE_DIR}/platform/graphics/texmap"
- "${WEBCORE_DIR}/platform/graphics/transforms"
- "${WEBCORE_DIR}/platform/mediastream"
- "${WEBCORE_DIR}/platform/network"
- "${WEBCORE_DIR}/platform/spi/cf"
- "${WEBCORE_DIR}/platform/sql"
- "${WEBCORE_DIR}/platform/text"
- "${WEBCORE_DIR}/plugins"
- "${WEBCORE_DIR}/rendering"
- "${WEBCORE_DIR}/rendering/line"
- "${WEBCORE_DIR}/rendering/shapes"
- "${WEBCORE_DIR}/rendering/style"
- "${WEBCORE_DIR}/storage"
- "${WEBCORE_DIR}/style"
- "${WEBCORE_DIR}/svg"
- "${WEBCORE_DIR}/svg/graphics"
- "${WEBCORE_DIR}/svg/properties"
- "${WEBCORE_DIR}/workers"
- "${JAVASCRIPTCORE_DIR}"
- "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
- "${JAVASCRIPTCORE_DIR}/API"
- "${JAVASCRIPTCORE_DIR}/assembler"
- "${JAVASCRIPTCORE_DIR}/bytecode"
- "${JAVASCRIPTCORE_DIR}/bytecompiler"
- "${JAVASCRIPTCORE_DIR}/collector/handles"
- "${JAVASCRIPTCORE_DIR}/dfg"
- "${JAVASCRIPTCORE_DIR}/disassembler"
- "${JAVASCRIPTCORE_DIR}/domjit"
- "${JAVASCRIPTCORE_DIR}/heap"
- "${JAVASCRIPTCORE_DIR}/interpreter"
- "${JAVASCRIPTCORE_DIR}/jit"
- "${JAVASCRIPTCORE_DIR}/parser"
- "${JAVASCRIPTCORE_DIR}/profiler"
- "${JAVASCRIPTCORE_DIR}/runtime"
- "${WTF_DIR}"
- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_WEBCORE_DIR}"
</del><span class="cx"> "${DERIVED_SOURCES_WEBKIT2_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_WEBKIT2_DIR}/include"
</span><del>- "${CMAKE_BINARY_DIR}"
- "${CMAKE_SOURCE_DIR}/Source"
</del><span class="cx"> "${CMAKE_SOURCE_DIR}/WebKitLibraries"
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-10 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2016-12-10 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> CrashTracer: com.apple.WebKit.Networking at WTF::ThreadSafeRefCounted<WebKit::NetworkCache::IOChannel>::deref
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -231,14 +231,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_INCLUDE_DIRECTORIES
</span><del>- "${WEBCORE_DIR}/platform/efl"
- "${WEBCORE_DIR}/platform/graphics/cairo"
- "${WEBCORE_DIR}/platform/graphics/efl"
- "${WEBCORE_DIR}/platform/graphics/freetype"
- "${WEBCORE_DIR}/platform/graphics/opentype"
- "${WEBCORE_DIR}/platform/graphics/x11"
- "${WEBCORE_DIR}/platform/network/soup"
- "${WEBCORE_DIR}/platform/text/enchant"
</del><span class="cx"> "${WEBKIT2_DIR}/DatabaseProcess/unix"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
</span><span class="lines">@@ -274,9 +266,6 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/efl"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
</span><del>- "${WTF_DIR}/wtf/efl"
- "${WTF_DIR}/wtf/glib"
- "${WTF_DIR}"
</del><span class="cx"> "${WEBKIT2_DIR}"
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -828,14 +828,6 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBKIT2_DIR}/PluginProcess/unix"
</span><del>- "${WEBCORE_DIR}/platform/cairo"
- "${WEBCORE_DIR}/platform/gtk"
- "${WEBCORE_DIR}/platform/graphics/cairo"
- "${WEBCORE_DIR}/platform/graphics/freetype"
- "${WEBCORE_DIR}/platform/graphics/opentype"
- "${WEBCORE_DIR}/platform/graphics/x11"
- "${WEBCORE_DIR}/platform/network/soup"
- "${WEBCORE_DIR}/platform/text/enchant"
</del><span class="cx"> "${WEBKIT2_DIR}/DatabaseProcess/unix"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
</span><span class="lines">@@ -872,9 +864,6 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/atk"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/gtk"
</span><del>- "${WTF_DIR}/wtf/gtk"
- "${WTF_DIR}/wtf/glib"
- "${WTF_DIR}"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
</span><span class="lines">@@ -1192,7 +1181,6 @@
</span><span class="cx"> WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp
</span><span class="cx"> )
</span><span class="cx"> list(APPEND WebKit2_INCLUDE_DIRECTORIES
</span><del>- "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
</del><span class="cx"> "${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
</span><span class="lines">@@ -1211,7 +1199,6 @@
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/C"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/InjectedBundle"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c"
</span><del>- "${DERIVED_SOURCES_DIR}"
</del><span class="cx"> "${DERIVED_SOURCES_DIR}/InjectedBundle"
</span><span class="cx"> "${FORWARDING_HEADERS_DIR}"
</span><span class="cx"> "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -372,20 +372,6 @@
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_INCLUDE_DIRECTORIES
</span><del>- "${WEBCORE_DIR}/icu"
- "${WEBCORE_DIR}/editing/cocoa"
- "${WEBCORE_DIR}/editing/mac"
- "${WEBCORE_DIR}/platform/cf"
- "${WEBCORE_DIR}/platform/cocoa"
- "${WEBCORE_DIR}/platform/graphics/cocoa"
- "${WEBCORE_DIR}/platform/mac"
- "${WEBCORE_DIR}/platform/network/cf"
- "${WEBCORE_DIR}/platform/network/cocoa"
- "${WEBCORE_DIR}/platform/spi/cocoa"
- "${WEBCORE_DIR}/platform/spi/mac"
- "${WEBCORE_DIR}/platform/graphics/ca"
- "${WEBCORE_DIR}/platform/graphics/cg"
- "${WEBCORE_DIR}/platform/graphics/opentype"
</del><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/cocoa"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/PluginProcess/mac"
</span><span class="lines">@@ -423,19 +409,9 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/Cocoa"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
</span><del>- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
</del><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-# This is needed because of a naming conflict with DiagnosticLoggingClient.h.
-# FIXME: Rename one of the DiagnosticLoggingClient headers.
-list(REMOVE_ITEM WebKit2_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/page"
-)
-list(APPEND WebKit2_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/page"
-)
-
</del><span class="cx"> set(XPCService_SOURCES
</span><span class="cx"> Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
</span><span class="cx"> Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -292,12 +292,12 @@
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><span class="cx"> macro(WEBKIT_FRAMEWORK _target)
</span><del>- include_directories(${${_target}_INCLUDE_DIRECTORIES})
</del><span class="cx"> include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
</span><span class="cx"> add_library(${_target} ${${_target}_LIBRARY_TYPE}
</span><span class="cx"> ${${_target}_HEADERS}
</span><span class="cx"> ${${_target}_SOURCES}
</span><span class="cx"> )
</span><ins>+ target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
</ins><span class="cx"> target_link_libraries(${_target} ${${_target}_LIBRARIES})
</span><span class="cx"> set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-12-10 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformMac.cmake:
+ * ImageDiff/CMakeLists.txt:
+ * MiniBrowser/gtk/CMakeLists.txt:
+ * MiniBrowser/mac/CMakeLists.txt:
+ * MiniBrowser/win/CMakeLists.txt:
+ * TestWebKitAPI/CMakeLists.txt:
+ * TestWebKitAPI/PlatformEfl.cmake:
+ * TestWebKitAPI/PlatformJSCOnly.cmake:
+ * TestWebKitAPI/PlatformMac.cmake:
+ * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt:
+ * WebKitTestRunner/CMakeLists.txt:
+ * WebKitTestRunner/PlatformGTK.cmake:
+ * WebKitTestRunner/PlatformMac.cmake:
+
</ins><span class="cx"> 2016-12-09 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed buildfix after r209630.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -26,58 +26,11 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(DumpRenderTree_INCLUDE_DIRECTORIES
</span><del>- ${WEBCORE_DIR}
- ${WEBCORE_DIR}/bindings
- ${WEBCORE_DIR}/bridge
- ${WEBCORE_DIR}/bridge/jsc
- ${WEBCORE_DIR}/css
- ${WEBCORE_DIR}/dom
- ${WEBCORE_DIR}/editing
- ${WEBCORE_DIR}/history
- ${WEBCORE_DIR}/html
- ${WEBCORE_DIR}/inspector
- ${WEBCORE_DIR}/loader
- ${WEBCORE_DIR}/loader/cache
- ${WEBCORE_DIR}/loader/icon
- ${WEBCORE_DIR}/page
- ${WEBCORE_DIR}/page/animation
- ${WEBCORE_DIR}/platform
- ${WEBCORE_DIR}/platform/animation
- ${WEBCORE_DIR}/platform/graphics
- ${WEBCORE_DIR}/platform/graphics/transforms
- ${WEBCORE_DIR}/platform/network
- ${WEBCORE_DIR}/platform/text
- ${WEBCORE_DIR}/plugins
- ${WEBCORE_DIR}/rendering
- ${WEBCORE_DIR}/rendering/shapes
- ${WEBCORE_DIR}/rendering/style
- ${JAVASCRIPTCORE_DIR}
- ${JAVASCRIPTCORE_DIR}/API
- ${JAVASCRIPTCORE_DIR}/assembler
- ${JAVASCRIPTCORE_DIR}/bytecode
- ${JAVASCRIPTCORE_DIR}/dfg
- ${JAVASCRIPTCORE_DIR}/disassembler
- ${JAVASCRIPTCORE_DIR}/domjit
- ${JAVASCRIPTCORE_DIR}/heap
- ${JAVASCRIPTCORE_DIR}/interpreter
- ${JAVASCRIPTCORE_DIR}/jit
- ${JAVASCRIPTCORE_DIR}/llint
- ${JAVASCRIPTCORE_DIR}/parser
- ${JAVASCRIPTCORE_DIR}/profiler
- ${JAVASCRIPTCORE_DIR}/runtime
- ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
</del><span class="cx"> ${DERIVED_SOURCES_DIR}/DumpRenderTree
</span><span class="cx"> ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
</span><span class="cx"> ${WEBKIT_TESTRUNNER_SHARED_DIR}/Bindings
</span><span class="cx"> ${TOOLS_DIR}/DumpRenderTree
</span><del>- ${WTF_DIR}
</del><span class="cx"> ${CMAKE_SOURCE_DIR}/Source
</span><del>- ${CMAKE_BINARY_DIR}
- ${DERIVED_SOURCES_DIR}
- ${DERIVED_SOURCES_WEBCORE_DIR}
- ${WEBCORE_DIR}/bindings/js
</del><span class="cx"> ${WEBCORE_DIR}/testing/js
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore
</span><span class="cx"> ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit
</span><span class="cx"> ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy
</span><del>- ${WTF_DIR}/icu
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Common ${TestNetscapePlugIn_SOURCES} from CMakeLists.txt are C++ source files.
</span></span></pre></div>
<a id="trunkToolsImageDiffCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ImageDiff/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ImageDiff/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/ImageDiff/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,10 +1,5 @@
</span><span class="cx"> set(IMAGE_DIFF_DIR "${TOOLS_DIR}/ImageDiff")
</span><span class="cx">
</span><del>-set(IMAGE_DIFF_INCLUDE_DIRECTORIES
- ${CMAKE_BINARY_DIR}
- ${WTF_DIR}
-)
-
</del><span class="cx"> set(IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES "")
</span><span class="cx">
</span><span class="cx"> set(IMAGE_DIFF_LIBRARIES
</span></span></pre></div>
<a id="trunkToolsMiniBrowsergtkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(MiniBrowser_INCLUDE_DIRECTORIES
</span><del>- ${CMAKE_BINARY_DIR}
</del><span class="cx"> ${DERIVED_SOURCES_MINIBROWSER_DIR}
</span><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
</span><span class="cx"> ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -16,9 +16,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(MiniBrowser_INCLUDE_DIRECTORIES
</span><del>- ${CMAKE_BINARY_DIR}
</del><span class="cx"> ${CMAKE_SOURCE_DIR}/Source
</span><del>- ${DERIVED_SOURCES_DIR}
</del><span class="cx"> ${DERIVED_SOURCES_DIR}/ForwardingHeaders
</span><span class="cx"> ${FORWARDING_HEADERS_DIR}
</span><span class="cx"> ${MINIBROWSER_DIR}
</span></span></pre></div>
<a id="trunkToolsMiniBrowserwinCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -1,7 +1,6 @@
</span><span class="cx"> set(MiniBrowser_INCLUDE_DIRECTORIES
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit"
</span><del>- "${WTF_DIR}"
</del><span class="cx"> "${CMAKE_SOURCE_DIR}"
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source"
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPICMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -99,25 +99,8 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}
</span><span class="cx"> ${CMAKE_BINARY_DIR}
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source
</span><del>- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
- ${DERIVED_SOURCES_WEBCORE_DIR}
</del><span class="cx"> ${JAVASCRIPTCORE_DIR}
</span><del>- ${JAVASCRIPTCORE_DIR}/API
- ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
</del><span class="cx"> ${THIRDPARTY_DIR}/gtest/include
</span><del>- ${WEBCORE_DIR}/css
- ${WEBCORE_DIR}/css/parser
- ${WEBCORE_DIR}/dom
- ${WEBCORE_DIR}/editing
- ${WEBCORE_DIR}/loader/cache
- ${WEBCORE_DIR}/page
- ${WEBCORE_DIR}/platform
- ${WEBCORE_DIR}/platform/animation
- ${WEBCORE_DIR}/platform/graphics
- ${WEBCORE_DIR}/platform/text
- ${WEBCORE_DIR}/platform/network
- ${WEBCORE_DIR}/platform/network/soup
- ${WEBCORE_DIR}/rendering/style
</del><span class="cx"> ${WEBKIT2_DIR}/Platform/IPC
</span><span class="cx"> ${WEBKIT2_DIR}/Shared
</span><span class="cx"> ${WEBKIT2_DIR}/Shared/API
</span><span class="lines">@@ -127,7 +110,6 @@
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API
</span><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle
</span><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
</span><del>- ${WTF_DIR}
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBKIT2)
</span><span class="lines">@@ -222,6 +204,8 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/TestsController.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ target_link_libraries(TestWebKitAPIBase ${test_webkit2_api_LIBRARIES})
+
</ins><span class="cx"> add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
</span><span class="cx">
</span><span class="cx"> foreach (testName ${test_webkit2_api_BINARIES})
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -9,7 +9,6 @@
</span><span class="cx">
</span><span class="cx"> include_directories(
</span><span class="cx"> ${DERIVED_SOURCES_WEBKIT2_DIR}/include
</span><del>- ${WTF_DIR}/wtf/efl
</del><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/C/CoordinatedGraphics
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/C/soup
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/C/efl
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformJSCOnlycmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -3,7 +3,6 @@
</span><span class="cx">
</span><span class="cx"> include_directories(
</span><span class="cx"> ${DERIVED_SOURCES_DIR}/ForwardingHeaders
</span><del>- "${WTF_DIR}/icu"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformMac.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -3,7 +3,6 @@
</span><span class="cx">
</span><span class="cx"> include_directories(
</span><span class="cx"> ${DERIVED_SOURCES_DIR}/ForwardingHeaders
</span><del>- "${WTF_DIR}/icu"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(test_main_SOURCES
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -12,10 +12,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> include_directories(
</span><del>- ${CMAKE_BINARY_DIR}
</del><span class="cx"> ${CMAKE_SOURCE_DIR}/Source
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WTF
</span><del>- ${DERIVED_SOURCES_DIR}
</del><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
</span><span class="cx"> ${FORWARDING_HEADERS_DIR}
</span><span class="cx"> ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -35,16 +35,6 @@
</span><span class="cx"> ${WEBKIT_TESTRUNNER_DIR}/InjectedBundle/atk
</span><span class="cx"> ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
</span><span class="cx"> ${WEBKIT_TESTRUNNER_BINDINGS_DIR}
</span><del>- ${JAVASCRIPTCORE_DIR}
- ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
- ${WEBCORE_DIR}/editing
- ${WEBCORE_DIR}/platform
- ${WEBCORE_DIR}/platform/graphics
- ${WEBCORE_DIR}/platform/graphics/harfbuzz
- ${WEBCORE_DIR}/platform/graphics/harfbuzz/ng
- ${WEBCORE_DIR}/platform/network
- ${WEBCORE_DIR}/platform/text
</del><span class="cx"> ${WEBCORE_DIR}/testing/js
</span><span class="cx"> ${WEBKIT2_DIR}/Platform/IPC
</span><span class="cx"> ${WEBKIT2_DIR}/Shared
</span><span class="lines">@@ -54,10 +44,8 @@
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/C/soup
</span><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle
</span><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
</span><del>- ${WTF_DIR}
</del><span class="cx"> ${DERIVED_SOURCES_DIR}/InjectedBundle
</span><span class="cx"> ${DERIVED_SOURCES_DIR}/UIScriptContext
</span><del>- ${CMAKE_BINARY_DIR}
</del><span class="cx"> ${CMAKE_SOURCE_DIR}/Source
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -15,7 +15,6 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
</span><span class="cx"> ${FORWARDING_HEADERS_DIR}
</span><del>- ${WTF_DIR}/wtf/glib
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/PlatformMac.cmake (209664 => 209665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> ${WEBKIT_TESTRUNNER_DIR}/cocoa
</span><span class="cx"> ${WEBKIT_TESTRUNNER_DIR}/mac
</span><span class="cx"> ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac
</span><del>- ${WTF_DIR}/icu
</del><span class="cx"> ${CMAKE_SOURCE_DIR}/WebKitLibraries
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>