<!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>[199094] 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/199094">199094</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-04-05 22:31:07 -0700 (Tue, 05 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make CMake-generated binaries on Mac able to run
https://bugs.webkit.org/show_bug.cgi?id=156268
Reviewed by Daniel Bates.
.:
* Source/cmake/OptionsMac.cmake:
Source/JavaScriptCore:
* CMakeLists.txt:
Source/WebCore:
* CMakeLists.txt:
* PlatformMac.cmake:
Source/WebKit:
* CMakeLists.txt:
Source/WebKit2:
* CMakeLists.txt:
* PlatformMac.cmake:
Tools:
* DumpRenderTree/CMakeLists.txt:
* DumpRenderTree/PlatformMac.cmake:
* DumpRenderTree/PlatformWin.cmake:
* TestWebKitAPI/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="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.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="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.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="#trunkToolsDumpRenderTreePlatformWincmake">trunk/Tools/DumpRenderTree/PlatformWin.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformMaccmake">trunk/Tools/TestWebKitAPI/PlatformMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-05 Alex Christensen <achristensen@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * Source/cmake/OptionsMac.cmake:
+
</ins><span class="cx"> 2016-04-04 Alejandro G. Castro <alex@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r198492): [GTK] The WEB_RTC flag was not correctly added in some situations
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -1326,10 +1326,12 @@
</span><span class="cx"> WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
</span><span class="cx"> WEBKIT_FRAMEWORK(JavaScriptCore)
</span><span class="cx">
</span><del>-if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
- POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
- set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
- install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}")
</del><ins>+if (NOT APPLE)
+ if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
+ POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
+ set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
+ install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}")
+ endif ()
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> # Force staging of shared scripts, even if they aren't directly used to build JavaScriptCore.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-05 Alex Christensen <achristensen@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+
</ins><span class="cx"> 2016-04-05 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve some other cases of context-sensitive inlining
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -3419,8 +3419,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCoreTestSupport_LIBRARIES
</span><del>- JavaScriptCore${DEBUG_SUFFIX}
- WTF${DEBUG_SUFFIX}
</del><ins>+ PRIVATE JavaScriptCore${DEBUG_SUFFIX}
+ PRIVATE WTF${DEBUG_SUFFIX}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Modules that the bindings generator scripts may use
</span><span class="lines">@@ -3814,6 +3814,10 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_FRAMEWORK(WebCore)
</span><span class="cx">
</span><ins>+if (APPLE)
+ set_target_properties(WebCore PROPERTIES LINK_FLAGS "-sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy")
+endif ()
+
</ins><span class="cx"> if (WIN32)
</span><span class="cx"> add_custom_target(WebCoreDerivedSources_PreBuild COMMAND ${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND} VERBATIM)
</span><span class="cx"> add_dependencies(WebCoreDerivedSources WebCoreDerivedSources_PreBuild)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebCore/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-05 Alex Christensen <achristensen@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2016-04-05 Jon Davis <jond@ingenesis.net>
</span><span class="cx">
</span><span class="cx"> Fixed CSS Shapes entry on the WebKit Feature Status page.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -926,11 +926,11 @@
</span><span class="cx"> ${ADDITIONAL_BINDINGS_DEPENDENCIES})
</span><span class="cx">
</span><span class="cx"> set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
</span><del>-list(APPEND WebCoreTestSupport_LIBRARIES WebCore)
</del><ins>+list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)
</ins><span class="cx"> list(APPEND WebCoreTestSupport_SOURCES
</span><span class="cx"> bindings/js/JSMockContentFilterSettingsCustom.cpp
</span><span class="cx">
</span><span class="cx"> testing/Internals.mm
</span><span class="cx"> testing/MockContentFilter.cpp
</span><span class="cx"> testing/MockContentFilterSettings.cpp
</span><del>-)
</del><span class="cx">\ No newline at end of file
</span><ins>+)
</ins></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebKit/CMakeLists.txt 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -50,3 +50,7 @@
</span><span class="cx"> if (WIN32)
</span><span class="cx"> add_dependencies(WebKit WebKitGUID)
</span><span class="cx"> endif ()
</span><ins>+
+if (APPLE)
+ set_target_properties(WebKit PROPERTIES LINK_FLAGS "-umbrella WebKit")
+endif ()
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebKit/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-05 Alex Christensen <achristensen@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+
</ins><span class="cx"> 2016-04-01 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Compile DumpRenderTree with CMake on Mac
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -740,13 +740,20 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(DatabaseProcess_LIBRARIES
</span><del>- WebKit2
</del><ins>+ WebKit2
</ins><span class="cx"> )
</span><span class="cx">
</span><del>-set(WebKit2_LIBRARIES
- JavaScriptCore
- WebCore
-)
</del><ins>+if (APPLE)
+ set(WebKit2_LIBRARIES
+ PRIVATE WebCore
+ PUBLIC JavaScriptCore
+ )
+else ()
+ set(WebKit2_LIBRARIES
+ JavaScriptCore
+ WebCore
+ )
+endif ()
</ins><span class="cx">
</span><span class="cx"> set(PluginProcess_LIBRARIES
</span><span class="cx"> WebKit2
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-05 Alex Christensen <achristensen@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2016-04-05 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Automation: add support for getting, deleting, and adding cookies
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> add_definitions(-DWK_XPC_SERVICE_SUFFIX=".Development")
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_LIBRARIES
</span><del>- WebKit
</del><ins>+ PRIVATE WebKit
</ins><span class="cx"> ${APPLICATION_SERVICES_LIBRARY}
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -717,6 +717,8 @@
</span><span class="cx"> file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
</span><span class="cx"> file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
</span><span class="cx">
</span><ins>+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
+
</ins><span class="cx"> set(WebKit2_OUTPUT_NAME WebKit)
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Source/cmake/OptionsMac.cmake 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+set(WEBKIT_MAC_VERSION 602.1.27)
+
</ins><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PRIVATE OFF)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Tools/ChangeLog 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-05 Alex Christensen <achristensen@webkit.org>
+
+ Make CMake-generated binaries on Mac able to run
+ https://bugs.webkit.org/show_bug.cgi?id=156268
+
+ Reviewed by Daniel Bates.
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformMac.cmake:
+ * DumpRenderTree/PlatformWin.cmake:
+ * TestWebKitAPI/PlatformMac.cmake:
+
</ins><span class="cx"> 2016-04-05 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Add a runtime flag to fetch API and related constructs
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -15,7 +15,6 @@
</span><span class="cx"> JavaScriptCore
</span><span class="cx"> WTF
</span><span class="cx"> WebCoreTestSupport
</span><del>- WebKit
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(DumpRenderTree_INCLUDE_DIRECTORIES
</span><span class="lines">@@ -103,7 +102,6 @@
</span><span class="cx"> JavaScriptCore
</span><span class="cx"> WTF
</span><span class="cx"> WebCoreTestSupport
</span><del>- WebKit
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -3,12 +3,25 @@
</span><span class="cx"> find_library(CORESERVICES_LIBRARY CoreServices)
</span><span class="cx"> add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks -iframework ${CORESERVICES_LIBRARY}/Frameworks)
</span><span class="cx">
</span><ins>+if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
+elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
+else ()
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
+endif ()
+link_directories(../../WebKitLibraries)
+
</ins><span class="cx"> list(APPEND TestNetscapePlugin_LIBRARIES
</span><span class="cx"> ${QUARTZ_LIBRARY}
</span><ins>+ WebKit2
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND DumpRenderTree_LIBRARIES
</span><span class="cx"> ${CARBON_LIBRARY}
</span><ins>+ ${QUARTZ_LIBRARY}
+ ${WEBKITSYSTEMINTERFACE_LIBRARY}
+ WebKit2
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_definitions("-ObjC++ -std=c++11")
</span><span class="lines">@@ -82,3 +95,23 @@
</span><span class="cx"> mac/WebArchiveDumpSupportMac.mm
</span><span class="cx"> mac/WorkQueueItemMac.mm
</span><span class="cx"> )
</span><ins>+
+set(DumpRenderTree_RESOURCES
+ AHEM____.TTF
+ FontWithFeatures.otf
+ FontWithFeatures.ttf
+ WebKitWeightWatcher100.ttf
+ WebKitWeightWatcher200.ttf
+ WebKitWeightWatcher300.ttf
+ WebKitWeightWatcher400.ttf
+ WebKitWeightWatcher500.ttf
+ WebKitWeightWatcher600.ttf
+ WebKitWeightWatcher700.ttf
+ WebKitWeightWatcher800.ttf
+ WebKitWeightWatcher900.ttf
+)
+
+file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources)
+foreach (_file ${DumpRenderTree_RESOURCES})
+ file(COPY ${TOOLS_DIR}/DumpRenderTree/fonts/${_file} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DumpRenderTree.resources)
+endforeach ()
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> list(APPEND TestNetscapePlugin_LIBRARIES
</span><span class="cx"> Msimg32
</span><span class="cx"> Shlwapi
</span><ins>+ WebKit
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(ImageDiff_SOURCES
</span><span class="lines">@@ -78,6 +79,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND DumpRenderTree_LIBRARIES
</span><ins>+ WebKit
</ins><span class="cx"> shlwapi
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformMac.cmake (199093 => 199094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2016-04-06 04:46:12 UTC (rev 199093)
+++ trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2016-04-06 05:31:07 UTC (rev 199094)
</span><span class="lines">@@ -21,6 +21,10 @@
</span><span class="cx"> libicucore.dylib
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+list(APPEND TestWebKitAPI_LIBRARIES
+ ${CARBON_LIBRARY}
+)
+
</ins><span class="cx"> set(bundle_harness_SOURCES
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/cocoa/PlatformUtilitiesCocoa.mm
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/mac/InjectedBundleControllerMac.mm
</span></span></pre>
</div>
</div>
</body>
</html>