Title: [207364] trunk/Source
- Revision
- 207364
- Author
- achristen...@apple.com
- Date
- 2016-10-14 17:11:24 -0700 (Fri, 14 Oct 2016)
Log Message
Fix CMake build.
* PlatformMac.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (207363 => 207364)
--- trunk/Source/WebCore/ChangeLog 2016-10-15 00:10:31 UTC (rev 207363)
+++ trunk/Source/WebCore/ChangeLog 2016-10-15 00:11:24 UTC (rev 207364)
@@ -1,3 +1,9 @@
+2016-10-14 Alex Christensen <achristen...@webkit.org>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+
2016-10-14 Anders Carlsson <ander...@apple.com>
Pass on networking settings to the PKPaymentRequest
Modified: trunk/Source/WebCore/PlatformMac.cmake (207363 => 207364)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-10-15 00:10:31 UTC (rev 207363)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-10-15 00:11:24 UTC (rev 207364)
@@ -51,9 +51,10 @@
${ZLIB_LIBRARIES}
)
+add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
+add_definitions(-iframework ${AVFOUNDATION_LIBRARY}/Versions/Current/Frameworks)
+add_definitions(-iframework ${CARBON_LIBRARY}/Versions/Current/Frameworks)
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
-add_definitions(-iframework ${AVFOUNDATION_LIBRARY}/Versions/Current/Frameworks)
-add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
find_library(DATADETECTORSCORE_FRAMEWORK DataDetectorsCore HINTS /System/Library/PrivateFrameworks)
if (NOT DATADETECTORSCORE_FRAMEWORK-NOTFOUND)
@@ -517,9 +518,6 @@
platform/network/cf/NetworkStorageSessionCFNet.cpp
platform/network/cf/ProxyServerCFNet.cpp
platform/network/cf/ResourceErrorCF.cpp
- platform/network/cf/ResourceHandleCFNet.cpp
- platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
- platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
platform/network/cf/ResourceRequestCFNet.cpp
platform/network/cf/ResourceResponseCFNet.cpp
platform/network/cf/SocketStreamHandleImplCFNet.cpp
@@ -543,7 +541,6 @@
platform/network/mac/NetworkStateNotifierMac.cpp
platform/network/mac/ResourceErrorMac.mm
platform/network/mac/ResourceHandleMac.mm
- platform/network/mac/ResourceRequestMac.mm
platform/network/mac/SynchronousLoaderClient.mm
platform/network/mac/UTIUtilities.mm
platform/network/mac/WebCoreResourceHandleAsDelegate.mm
@@ -622,6 +619,7 @@
page/animation
page/cocoa
+ page/csp
page/mac
page/scrolling
Modified: trunk/Source/WebKit/ChangeLog (207363 => 207364)
--- trunk/Source/WebKit/ChangeLog 2016-10-15 00:10:31 UTC (rev 207363)
+++ trunk/Source/WebKit/ChangeLog 2016-10-15 00:11:24 UTC (rev 207364)
@@ -1,3 +1,9 @@
+2016-10-14 Alex Christensen <achristen...@webkit.org>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+
2016-10-13 Anders Carlsson <ander...@apple.com>
Move BackForwardList from WebCore to WebKitLegacy
Modified: trunk/Source/WebKit/PlatformMac.cmake (207363 => 207364)
--- trunk/Source/WebKit/PlatformMac.cmake 2016-10-15 00:10:31 UTC (rev 207363)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-10-15 00:11:24 UTC (rev 207364)
@@ -208,6 +208,7 @@
mac/DefaultDelegates/WebDefaultPolicyDelegate.m
mac/DefaultDelegates/WebDefaultUIDelegate.m
+ mac/History/BackForwardList.mm
mac/History/BinaryPropertyList.cpp
mac/History/HistoryPropertyList.mm
mac/History/WebBackForwardList.mm
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
