<!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>[191773] trunk/Source</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/191773">191773</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-29 21:14:34 -0700 (Thu, 29 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make WebCore a framework in Mac CMake build
https://bugs.webkit.org/show_bug.cgi?id=150702
Patch by Alex Christensen <achristensen@webkit.org> on 2015-10-29
Reviewed by Geoffrey Garen.
Source/WebCore:
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
Source/WebKit:
* PlatformMac.cmake:
Source/WebKit2:
* PlatformMac.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (191772 => 191773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-10-30 03:04:12 UTC (rev 191772)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-30 04:14:34 UTC (rev 191773)
</span><span class="lines">@@ -2104,7 +2104,6 @@
</span><span class="cx"> platform/FileChooser.cpp
</span><span class="cx"> platform/FileStream.cpp
</span><span class="cx"> platform/FileSystem.cpp
</span><del>- platform/KillRingNone.cpp
</del><span class="cx"> platform/Language.cpp
</span><span class="cx"> platform/Length.cpp
</span><span class="cx"> platform/LengthSize.cpp
</span><span class="lines">@@ -2345,7 +2344,6 @@
</span><span class="cx">
</span><span class="cx"> platform/text/BidiContext.cpp
</span><span class="cx"> platform/text/DateTimeFormat.cpp
</span><del>- platform/text/Hyphenation.cpp
</del><span class="cx"> platform/text/LineEnding.cpp
</span><span class="cx"> platform/text/LocaleToScriptMappingDefault.cpp
</span><span class="cx"> platform/text/PlatformLocale.cpp
</span><span class="lines">@@ -3772,3 +3770,5 @@
</span><span class="cx"> if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND WTF_CPU_ARM AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.9") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.3"))
</span><span class="cx"> set_source_files_properties(svg/SVGPathElement.cpp PROPERTIES COMPILE_FLAGS "-O2")
</span><span class="cx"> endif ()
</span><ins>+
+WEBKIT_FRAMEWORK(WebCore)
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191772 => 191773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-30 03:04:12 UTC (rev 191772)
+++ trunk/Source/WebCore/ChangeLog 2015-10-30 04:14:34 UTC (rev 191773)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-10-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Make WebCore a framework in Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150702
+
+ Reviewed by Geoffrey Garen.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+
+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> CMake build fix.
</span><span class="cx">
</span><span class="cx"> * editing/mac/EditorMac.mm:
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (191772 => 191773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-10-30 03:04:12 UTC (rev 191772)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-10-30 04:14:34 UTC (rev 191773)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx">
</span><span class="cx"> platform/ContextMenuItemNone.cpp
</span><span class="cx"> platform/ContextMenuNone.cpp
</span><ins>+ platform/KillRingNone.cpp
</ins><span class="cx">
</span><span class="cx"> platform/audio/efl/AudioBusEfl.cpp
</span><span class="cx">
</span><span class="lines">@@ -275,6 +276,7 @@
</span><span class="cx"> platform/soup/SharedBufferSoup.cpp
</span><span class="cx"> platform/soup/URLSoup.cpp
</span><span class="cx">
</span><ins>+ platform/text/Hyphenation.cpp
</ins><span class="cx"> platform/text/LocaleICU.cpp
</span><span class="cx">
</span><span class="cx"> platform/text/efl/TextBreakIteratorInternalICUEfl.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (191772 => 191773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-10-30 03:04:12 UTC (rev 191772)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-10-30 04:14:34 UTC (rev 191773)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> loader/soup/CachedRawResourceSoup.cpp
</span><span class="cx"> loader/soup/SubresourceLoaderSoup.cpp
</span><span class="cx">
</span><ins>+ platform/KillRingNone.cpp
</ins><span class="cx"> platform/PlatformStrategies.cpp
</span><span class="cx">
</span><span class="cx"> platform/audio/gstreamer/AudioDestinationGStreamer.cpp
</span><span class="lines">@@ -214,6 +215,7 @@
</span><span class="cx"> platform/soup/SharedBufferSoup.cpp
</span><span class="cx"> platform/soup/URLSoup.cpp
</span><span class="cx">
</span><ins>+ platform/text/Hyphenation.cpp
</ins><span class="cx"> platform/text/LocaleICU.cpp
</span><span class="cx">
</span><span class="cx"> platform/text/enchant/TextCheckerEnchant.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (191772 => 191773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-10-30 03:04:12 UTC (rev 191772)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-10-30 04:14:34 UTC (rev 191773)
</span><span class="lines">@@ -1,6 +1,55 @@
</span><del>-find_library(QUARTZ_FRAMEWORK Quartz)
-add_definitions(-iframework ${QUARTZ_FRAMEWORK}/Frameworks)
</del><ins>+set(WebCore_LIBRARY_TYPE SHARED)
</ins><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)
+
+find_library(ACCELERATE_LIBRARY accelerate)
+find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
+find_library(AUDIOUNIT_LIBRARY AudioUnit)
+find_library(CARBON_LIBRARY Carbon)
+find_library(COCOA_LIBRARY Cocoa)
+find_library(COREAUDIO_LIBRARY CoreAudio)
+find_library(DISKARBITRATION_LIBRARY DiskArbitration)
+find_library(IOKIT_LIBRARY IOKit)
+find_library(IOSURFACE_LIBRARY IOSurface)
+find_library(OPENGL_LIBRARY OpenGL)
+find_library(QUARTZ_LIBRARY Quartz)
+find_library(QUARTZCORE_LIBRARY QuartzCore)
+find_library(SECURITY_LIBRARY Security)
+find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
+find_library(SQLITE3_LIBRARY sqlite3)
+find_library(XML2_LIBRARY XML2)
+find_package(ZLIB REQUIRED)
+
+list(APPEND WebCore_LIBRARIES
+ ${ACCELERATE_LIBRARY}
+ ${AUDIOTOOLBOX_LIBRARY}
+ ${AUDIOUNIT_LIBRARY}
+ ${CARBON_LIBRARY}
+ ${COCOA_LIBRARY}
+ ${COREAUDIO_LIBRARY}
+ ${DISKARBITRATION_LIBRARY}
+ ${IOKIT_LIBRARY}
+ ${IOSURFACE_LIBRARY}
+ ${OPENGL_LIBRARY}
+ ${QUARTZ_LIBRARY}
+ ${QUARTZCORE_LIBRARY}
+ ${SECURITY_LIBRARY}
+ ${SQLITE3_LIBRARY}
+ ${SYSTEMCONFIGURATION_LIBRARY}
+ ${WEBKITSYSTEMINTERFACE_LIBRARY}
+ ${XML2_LIBRARY}
+ ${ZLIB_LIBRARIES}
+)
+
+add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
+
</ins><span class="cx"> find_library(DATADETECTORSCORE_FRAMEWORK DataDetectorsCore HINTS /System/Library/PrivateFrameworks)
</span><span class="cx"> if (NOT DATADETECTORSCORE_FRAMEWORK-NOTFOUND)
</span><span class="cx"> list(APPEND WebCore_LIBRARIES ${DATADETECTORSCORE_FRAMEWORK})
</span><span class="lines">@@ -344,7 +393,6 @@
</span><span class="cx"> platform/graphics/cg/ImageCG.cpp
</span><span class="cx"> platform/graphics/cg/ImageSourceCG.cpp
</span><span class="cx"> platform/graphics/cg/ImageSourceCGMac.mm
</span><del>- platform/graphics/cg/ImageSourceCGWin.cpp
</del><span class="cx"> platform/graphics/cg/IntPointCG.cpp
</span><span class="cx"> platform/graphics/cg/IntRectCG.cpp
</span><span class="cx"> platform/graphics/cg/IntSizeCG.cpp
</span><span class="lines">@@ -489,7 +537,6 @@
</span><span class="cx"> platform/network/mac/WebCoreURLResponse.mm
</span><span class="cx">
</span><span class="cx"> platform/posix/FileSystemPOSIX.cpp
</span><del>- platform/posix/SharedBufferPOSIX.cpp
</del><span class="cx">
</span><span class="cx"> platform/text/cf/HyphenationCF.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (191772 => 191773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-10-30 03:04:12 UTC (rev 191772)
+++ trunk/Source/WebKit/ChangeLog 2015-10-30 04:14:34 UTC (rev 191773)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2015-10-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Make WebCore a framework in Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150702
+
+ Reviewed by Geoffrey Garen.
+
+ * PlatformMac.cmake:
+
+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Fix Mac CMake build
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150686
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (191772 => 191773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2015-10-30 03:04:12 UTC (rev 191772)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-10-30 04:14:34 UTC (rev 191773)
</span><span class="lines">@@ -1,53 +1,7 @@
</span><del>-find_library(ACCELERATE_LIBRARY accelerate)
-find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
-find_library(AUDIOUNIT_LIBRARY AudioUnit)
-find_library(CARBON_LIBRARY Carbon)
-find_library(COCOA_LIBRARY Cocoa)
-find_library(COREAUDIO_LIBRARY CoreAudio)
-find_library(DISKARBITRATION_LIBRARY DiskArbitration)
-find_library(IOKIT_LIBRARY IOKit)
-find_library(IOSURFACE_LIBRARY IOSurface)
-find_library(OPENGL_LIBRARY OpenGL)
</del><span class="cx"> find_library(QUARTZ_LIBRARY Quartz)
</span><del>-find_library(QUARTZCORE_LIBRARY QuartzCore)
-find_library(SECURITY_LIBRARY Security)
-find_library(SQLITE3_LIBRARY sqlite3)
-find_library(SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)
-find_library(XML2_LIBRARY XML2)
-find_package(ZLIB REQUIRED)
-
</del><span class="cx"> add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
</span><del>-
-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 ()
</del><span class="cx"> link_directories(../../WebKitLibraries)
</span><span class="cx">
</span><del>-list(APPEND WebKit_LIBRARIES
- PRIVATE ${ACCELERATE_LIBRARY}
- PRIVATE ${AUDIOTOOLBOX_LIBRARY}
- PRIVATE ${AUDIOUNIT_LIBRARY}
- PRIVATE ${CARBON_LIBRARY}
- PRIVATE ${COCOA_LIBRARY}
- PRIVATE ${COREAUDIO_LIBRARY}
- PRIVATE ${DISKARBITRATION_LIBRARY}
- PRIVATE ${IOKIT_LIBRARY}
- PRIVATE ${IOSURFACE_LIBRARY}
- PRIVATE ${OPENGL_LIBRARY}
- PRIVATE ${QUARTZ_LIBRARY}
- PRIVATE ${QUARTZCORE_LIBRARY}
- PRIVATE ${SECURITY_LIBRARY}
- PRIVATE ${SQLITE3_LIBRARY}
- PRIVATE ${SYSTEM_CONFIGURATION_LIBRARY}
- PRIVATE ${WEBKITSYSTEMINTERFACE_LIBRARY}
- PRIVATE ${XML2_LIBRARY}
- PRIVATE ${ZLIB_LIBRARIES}
-)
-
</del><span class="cx"> list(APPEND WebKit_INCLUDE_DIRECTORIES
</span><span class="cx"> "${DERIVED_SOURCES_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191772 => 191773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-30 03:04:12 UTC (rev 191772)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-30 04:14:34 UTC (rev 191773)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2015-10-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Make WebCore a framework in Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150702
+
+ Reviewed by Geoffrey Garen.
+
+ * PlatformMac.cmake:
+
+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> EFL build fix after r191749
</span><span class="cx">
</span><span class="cx"> * CMakeLists.txt:
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (191772 => 191773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2015-10-30 03:04:12 UTC (rev 191772)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-10-30 04:14:34 UTC (rev 191773)
</span><span class="lines">@@ -1,54 +1,11 @@
</span><span class="cx"> add_definitions("-ObjC++ -std=c++11")
</span><del>-
-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 ()
</del><span class="cx"> link_directories(../../WebKitLibraries)
</span><del>-
-find_library(ACCELERATE_LIBRARY accelerate)
-find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
-find_library(AUDIOUNIT_LIBRARY AudioUnit)
</del><span class="cx"> find_library(CARBON_LIBRARY Carbon)
</span><del>-find_library(COCOA_LIBRARY Cocoa)
-find_library(COREAUDIO_LIBRARY CoreAudio)
-find_library(DISKARBITRATION_LIBRARY DiskArbitration)
-find_library(IOKIT_LIBRARY IOKit)
-find_library(IOSURFACE_LIBRARY IOSurface)
-find_library(OPENGL_LIBRARY OpenGL)
</del><span class="cx"> find_library(QUARTZ_LIBRARY Quartz)
</span><del>-find_library(QUARTZCORE_LIBRARY QuartzCore)
-find_library(SECURITY_LIBRARY Security)
-find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
-find_library(SQLITE3_LIBRARY sqlite3)
-find_library(XML2_LIBRARY XML2)
-find_package(ZLIB REQUIRED)
-
</del><span class="cx"> add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
</span><span class="cx"> add_definitions(-iframework ${CARBON_LIBRARY}/Frameworks)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_LIBRARIES
</span><del>- ${ACCELERATE_LIBRARY}
- ${AUDIOTOOLBOX_LIBRARY}
- ${AUDIOUNIT_LIBRARY}
- ${CARBON_LIBRARY}
- ${COCOA_LIBRARY}
- ${COREAUDIO_LIBRARY}
- ${DISKARBITRATION_LIBRARY}
- ${IOKIT_LIBRARY}
- ${IOSURFACE_LIBRARY}
- ${OPENGL_LIBRARY}
- ${QUARTZ_LIBRARY}
- ${QUARTZCORE_LIBRARY}
- ${SECURITY_LIBRARY}
- ${SQLITE3_LIBRARY}
- ${SYSTEMCONFIGURATION_LIBRARY}
- ${WEBKITSYSTEMINTERFACE_LIBRARY}
- ${XML2_LIBRARY}
- ${ZLIB_LIBRARIES}
</del><span class="cx"> WebKit
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -492,7 +449,6 @@
</span><span class="cx"> UIProcess/Cocoa
</span><span class="cx">
</span><span class="cx"> UIProcess/API/C
</span><del>- UIProcess/API/Cocoa
</del><span class="cx"> UIProcess/API/cpp
</span><span class="cx">
</span><span class="cx"> WebProcess/WebPage
</span><span class="lines">@@ -502,6 +458,18 @@
</span><span class="cx"> WebProcess/InjectedBundle/API/mac
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+# This is needed right now to import ObjC headers instead of including them.
+# FIXME: Forwarding headers should be copies of actual headers.
+file(GLOB ObjCHeaders UIProcess/API/Cocoa/*.h)
+foreach (_file ${ObjCHeaders})
+ get_filename_component(_name ${_file} NAME)
+ if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_name})
+ file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_name} "#import <WebKit2/UIProcess/API/Cocoa/${_name}>")
+ endif ()
+endforeach ()
+
+set(WebKit2_OUTPUT_NAME WebKit)
+
</ins><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/MessageRecorderProbes.h
</span><span class="cx"> MAIN_DEPENDENCY Platform/IPC/MessageRecorderProbes.d
</span></span></pre>
</div>
</div>
</body>
</html>