Title: [198659] trunk/Source
- Revision
- 198659
- Author
- achristen...@apple.com
- Date
- 2016-03-24 20:59:30 -0700 (Thu, 24 Mar 2016)
Log Message
Fix Mac CMake build.
Source/_javascript_Core:
* PlatformMac.cmake:
Link to Security framework.
Source/WebCore:
* PlatformMac.cmake:
Add new file and directory.
Source/WebKit2:
* CMakeLists.txt:
Temporarily add DERIVED_SOURCES_JAVASCRIPTCORE_DIR after DERIVED_SOURCES_WEBCORE_DIR,
because both contain a unique header named InspectorBackendDispatchers.h and this include
order includes the correct one for WebKit2 first.
* PlatformMac.cmake:
Add new files. Optionally link to AVFAudio.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (198658 => 198659)
--- trunk/Source/_javascript_Core/ChangeLog 2016-03-25 02:24:51 UTC (rev 198658)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-03-25 03:59:30 UTC (rev 198659)
@@ -1,3 +1,10 @@
+2016-03-24 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build.
+
+ * PlatformMac.cmake:
+ Link to Security framework.
+
2016-03-24 Saam barati <sbar...@apple.com>
ES6: Implement IsRegExp function and use where needed in String.prototype.* methods
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (198658 => 198659)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2016-03-25 02:24:51 UTC (rev 198658)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2016-03-25 03:59:30 UTC (rev 198659)
@@ -18,6 +18,11 @@
)
add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
+find_library(SECURITY_LIBRARY Security)
+list(APPEND _javascript_Core_LIBRARIES
+ ${SECURITY_LIBRARY}
+)
+
add_custom_command(
OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
DEPENDS ${_javascript_CORE_DIR}/runtime/Tracing.d
Modified: trunk/Source/WebCore/ChangeLog (198658 => 198659)
--- trunk/Source/WebCore/ChangeLog 2016-03-25 02:24:51 UTC (rev 198658)
+++ trunk/Source/WebCore/ChangeLog 2016-03-25 03:59:30 UTC (rev 198659)
@@ -1,3 +1,10 @@
+2016-03-24 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build.
+
+ * PlatformMac.cmake:
+ Add new file and directory.
+
2016-03-24 Chris Dumez <cdu...@apple.com>
Unreviewed, rolling out r198500.
Modified: trunk/Source/WebCore/PlatformMac.cmake (198658 => 198659)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-03-25 02:24:51 UTC (rev 198658)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-03-25 03:59:30 UTC (rev 198659)
@@ -532,6 +532,7 @@
platform/network/cocoa/CredentialCocoa.mm
platform/network/cocoa/ProtectionSpaceCocoa.mm
+ platform/network/cocoa/ResourceLoadTiming.mm
platform/network/cocoa/ResourceRequestCocoa.mm
platform/network/cocoa/ResourceResponseCocoa.mm
platform/network/cocoa/WebCoreNSURLSession.mm
@@ -595,7 +596,7 @@
Modules/notifications
Modules/webdatabase
- Modules/indexeddb/legacy
+ Modules/indexeddb/client
Modules/indexeddb/shared
Modules/indexeddb/server
Modified: trunk/Source/WebKit2/CMakeLists.txt (198658 => 198659)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-03-25 02:24:51 UTC (rev 198658)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-03-25 03:59:30 UTC (rev 198659)
@@ -145,7 +145,6 @@
"${_javascript_CORE_DIR}/runtime"
"${WTF_DIR}"
"${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
"${DERIVED_SOURCES_WEBCORE_DIR}"
"${DERIVED_SOURCES_WEBKIT2_DIR}"
"${DERIVED_SOURCES_WEBKIT2_DIR}/include"
@@ -154,6 +153,11 @@
"${CMAKE_SOURCE_DIR}/WebKitLibraries"
)
+# FIXME: We shouldn't need to have this after DERIVED_SOURCES_WEBCORE_DIR, but there are too many files named InspectorBackendDispatchers.h on Mac.
+list(APPEND WebKit2_INCLUDE_DIRECTORIES
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
+)
+
set(PROTOCOL_GENERATOR_SCRIPTS_DIR "${_javascript_CORE_DIR}/inspector/scripts")
set(WebKit2_SYSTEM_INCLUDE_DIRECTORIES
Modified: trunk/Source/WebKit2/ChangeLog (198658 => 198659)
--- trunk/Source/WebKit2/ChangeLog 2016-03-25 02:24:51 UTC (rev 198658)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-25 03:59:30 UTC (rev 198659)
@@ -1,3 +1,14 @@
+2016-03-24 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build.
+
+ * CMakeLists.txt:
+ Temporarily add DERIVED_SOURCES_JAVASCRIPTCORE_DIR after DERIVED_SOURCES_WEBCORE_DIR,
+ because both contain a unique header named InspectorBackendDispatchers.h and this include
+ order includes the correct one for WebKit2 first.
+ * PlatformMac.cmake:
+ Add new files. Optionally link to AVFAudio.
+
2016-03-24 Said Abou-Hallawa <sabouhallawa@apple,com>
Change NativeImagePtr for CG to be RetainPtr<CGImageRef>
Modified: trunk/Source/WebKit2/PlatformMac.cmake (198658 => 198659)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-03-25 02:24:51 UTC (rev 198658)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-03-25 03:59:30 UTC (rev 198659)
@@ -2,6 +2,8 @@
link_directories(../../WebKitLibraries)
find_library(CARBON_LIBRARY Carbon)
find_library(QUARTZ_LIBRARY Quartz)
+find_library(AVFOUNDATION_LIBRARY AVFoundation)
+find_library(AVFAUDIO_LIBRARY AVFAudio HINTS ${AVFOUNDATION_LIBRARY})
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
add_definitions(-iframework ${CARBON_LIBRARY}/Frameworks)
add_definitions(-DWK_XPC_SERVICE_SUFFIX=".Development")
@@ -10,16 +12,25 @@
WebKit
)
+if (NOT AVFAUDIO_LIBRARY-NOTFOUND)
+ list(APPEND WebKit2_LIBRARIES ${AVFAUDIO_LIBRARY})
+endif ()
+
list(APPEND WebKit2_SOURCES
DatabaseProcess/mac/DatabaseProcessMac.mm
NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm
+ NetworkProcess/Downloads/PendingDownload.cpp
+
+ NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
+
NetworkProcess/Downloads/mac/DownloadMac.mm
NetworkProcess/cache/NetworkCacheDataCocoa.mm
NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm
+ NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
NetworkProcess/cocoa/NetworkProcessCocoa.mm
NetworkProcess/cocoa/NetworkSessionCocoa.mm
@@ -191,9 +202,11 @@
UIProcess/API/Cocoa/_WKThumbnailView.mm
UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
UIProcess/API/Cocoa/_WKUserContentFilter.mm
+ UIProcess/API/Cocoa/_WKUserContentWorld.mm
UIProcess/API/Cocoa/_WKUserStyleSheet.mm
UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm
UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
+ UIProcess/API/Cocoa/_WKWebsiteDataSize.mm
UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
UIProcess/API/mac/WKView.mm
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
