<!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>[188643] 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/188643">188643</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-19 11:37:02 -0700 (Wed, 19 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build TestWTF on Mac with CMake.
https://bugs.webkit.org/show_bug.cgi?id=147972
Patch by Alex Christensen <achristensen@webkit.org> on 2015-08-19
Reviewed by Tim Horton.
.:
* Source/cmake/OptionsMac.cmake:
Enable API tests in Mac's CMake build.
Source/WebKit2:
* PlatformMac.cmake:
Make more forwarding headers.
Tools:
TestWTF only depends on gtest and WTF instead of TestWebKitAPi depending on all of WebKit.
Now I can run the WTF API tests after a few seconds of building instead of waiting for all of WebKit to build.
* TestWebKitAPI/CMakeLists.txt:
Added WTF as a dependency for platforms that do not have ForwardingHeadersForTestWebKitAPI_NAME.
WTF was already a library that was linked, but having at least one item makes the syntax of add_dependencies work.
* TestWebKitAPI/PlatformMac.cmake: Added.
* TestWebKitAPI/config.h:
Postpone some build fixes until WebKit builds completely on Mac with CMake.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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="#trunkToolsTestWebKitAPICMakeListstxt">trunk/Tools/TestWebKitAPI/CMakeLists.txt</a></li>
<li><a href="#trunkToolsTestWebKitAPIconfigh">trunk/Tools/TestWebKitAPI/config.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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 (188642 => 188643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/ChangeLog 2015-08-19 18:37:02 UTC (rev 188643)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-19 Alex Christensen <achristensen@webkit.org>
+
+ Build TestWTF on Mac with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147972
+
+ Reviewed by Tim Horton.
+
+ * Source/cmake/OptionsMac.cmake:
+ Enable API tests in Mac's CMake build.
+
</ins><span class="cx"> 2015-08-18 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CMake] REGRESSION(r188540): WebKitTestRunner is not longer built and all the tests (layout and perf) fail.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (188642 => 188643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-19 18:37:02 UTC (rev 188643)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-19 Alex Christensen <achristensen@webkit.org>
+
+ Build TestWTF on Mac with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147972
+
+ Reviewed by Tim Horton.
+
+ * PlatformMac.cmake:
+ Make more forwarding headers.
+
</ins><span class="cx"> 2015-08-18 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace all uses of std::mutex/std::condition_variable with WTF::Lock/WTF::Condition
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (188642 => 188643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-08-19 18:37:02 UTC (rev 188643)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> UIProcess/Cocoa
</span><span class="cx">
</span><span class="cx"> UIProcess/API/C
</span><ins>+ UIProcess/API/Cocoa
</ins><span class="cx">
</span><span class="cx"> WebProcess/WebPage
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (188642 => 188643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-08-19 18:37:02 UTC (rev 188643)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphoneos PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphonesimulator PRIVATE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS_macosx PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS_macosx_1080 PRIVATE OFF)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188642 => 188643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Tools/ChangeLog 2015-08-19 18:37:02 UTC (rev 188643)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-19 Alex Christensen <achristensen@webkit.org>
+
+ Build TestWTF on Mac with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147972
+
+ Reviewed by Tim Horton.
+
+ TestWTF only depends on gtest and WTF instead of TestWebKitAPi depending on all of WebKit.
+ Now I can run the WTF API tests after a few seconds of building instead of waiting for all of WebKit to build.
+
+ * TestWebKitAPI/CMakeLists.txt:
+ Added WTF as a dependency for platforms that do not have ForwardingHeadersForTestWebKitAPI_NAME.
+ WTF was already a library that was linked, but having at least one item makes the syntax of add_dependencies work.
+ * TestWebKitAPI/PlatformMac.cmake: Added.
+ * TestWebKitAPI/config.h:
+ Postpone some build fixes until WebKit builds completely on Mac with CMake.
+
</ins><span class="cx"> 2015-08-19 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, add Aleksandr Skachkov to the list of contributors.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPICMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (188642 => 188643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-08-19 18:37:02 UTC (rev 188643)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})
</span><del>- add_dependencies(TestWebKitAPIInjectedBundle ${ForwardingHeadersForTestWebKitAPI_NAME})
</del><ins>+ add_dependencies(TestWebKitAPIInjectedBundle WTF ${ForwardingHeadersForTestWebKitAPI_NAME})
</ins><span class="cx">
</span><span class="cx"> get_property(TestWebKitAPIInjectedBundle_PATH TARGET TestWebKitAPIInjectedBundle PROPERTY LOCATION)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformMaccmake"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/PlatformMac.cmake (0 => 188643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformMac.cmake (rev 0)
+++ trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2015-08-19 18:37:02 UTC (rev 188643)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}")
+
+include_directories(
+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders
+ "${WTF_DIR}/icu"
+)
+
+set(test_main_SOURCES
+ ${TESTWEBKITAPI_DIR}/mac/mainMac.mm
+)
+
+find_library(CARBON_LIBRARY Carbon)
+find_library(COCOA_LIBRARY Cocoa)
+find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+list(APPEND test_wtf_LIBRARIES
+ ${CARBON_LIBRARY}
+ ${COCOA_LIBRARY}
+ ${COREFOUNDATION_LIBRARY}
+ libicucore.dylib
+)
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPIconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/config.h (188642 => 188643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/config.h 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Tools/TestWebKitAPI/config.h 2015-08-19 18:37:02 UTC (rev 188643)
</span><span class="lines">@@ -83,8 +83,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) && defined(__OBJC__)
</span><ins>+// FIXME: Get Cocoa tests working with CMake on Mac.
+#if !defined(BUILDING_WITH_CMAKE)
</ins><span class="cx"> #import <WebKit/WebKit.h>
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #define WK_HAVE_C_SPI 1
</span></span></pre>
</div>
</div>
</body>
</html>