Title: [209786] trunk
- Revision
- 209786
- Author
- achristen...@apple.com
- Date
- 2016-12-13 18:39:39 -0800 (Tue, 13 Dec 2016)
Log Message
Fix CMake build.
Source/WebKit2:
* PlatformMac.cmake:
Tools:
* DumpRenderTree/PlatformMac.cmake:
Define NS_RETURNS_RETAINED as nothing for now.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (209785 => 209786)
--- trunk/Source/WebKit2/ChangeLog 2016-12-14 01:31:43 UTC (rev 209785)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-14 02:39:39 UTC (rev 209786)
@@ -1,3 +1,9 @@
+2016-12-13 Alex Christensen <achristen...@webkit.org>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+
2016-12-13 Jer Noble <jer.no...@apple.com>
Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible
Modified: trunk/Source/WebKit2/PlatformMac.cmake (209785 => 209786)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-12-14 01:31:43 UTC (rev 209785)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-12-14 02:39:39 UTC (rev 209786)
@@ -410,6 +410,7 @@
"${WEBKIT2_DIR}/WebProcess/WebPage/mac"
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
+ "${DERIVED_SOURCES_WEBCORE_DIR}"
)
set(XPCService_SOURCES
Modified: trunk/Tools/ChangeLog (209785 => 209786)
--- trunk/Tools/ChangeLog 2016-12-14 01:31:43 UTC (rev 209785)
+++ trunk/Tools/ChangeLog 2016-12-14 02:39:39 UTC (rev 209786)
@@ -1,3 +1,10 @@
+2016-12-13 Alex Christensen <achristen...@webkit.org>
+
+ Fix CMake build.
+
+ * DumpRenderTree/PlatformMac.cmake:
+ Define NS_RETURNS_RETAINED as nothing for now.
+
2016-12-13 Jer Noble <jer.no...@apple.com>
Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (209785 => 209786)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-12-14 01:31:43 UTC (rev 209785)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-12-14 02:39:39 UTC (rev 209786)
@@ -1,8 +1,10 @@
find_library(QUARTZ_LIBRARY Quartz)
find_library(CARBON_LIBRARY Carbon)
find_library(CORESERVICES_LIBRARY CoreServices)
-add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks -iframework ${CORESERVICES_LIBRARY}/Frameworks)
+# FIXME: We shouldn't need to define NS_RETURNS_RETAINED.
+add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks -iframework ${CORESERVICES_LIBRARY}/Frameworks -DNS_RETURNS_RETAINED=)
+
if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
