From 49251c2e8ae5e8e0650e960ba80914ba10adb186 Mon Sep 17 00:00:00 2001 From: "achristensen@apple.com" Date: Wed, 14 Dec 2016 02:39:39 +0000 Subject: [PATCH] Fix CMake build. Source/WebKit2: * PlatformMac.cmake: Tools: * DumpRenderTree/PlatformMac.cmake: Define NS_RETURNS_RETAINED as nothing for now. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@209786 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 6 ++++++ Source/WebKit2/PlatformMac.cmake | 1 + Tools/ChangeLog | 7 +++++++ Tools/DumpRenderTree/PlatformMac.cmake | 4 +++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 2e61059..7c6eb1c 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,9 @@ +2016-12-13 Alex Christensen + + Fix CMake build. + + * PlatformMac.cmake: + 2016-12-13 Jer Noble Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible diff --git a/Source/WebKit2/PlatformMac.cmake b/Source/WebKit2/PlatformMac.cmake index bc63ffe..c75daee 100644 --- a/Source/WebKit2/PlatformMac.cmake +++ b/Source/WebKit2/PlatformMac.cmake @@ -410,6 +410,7 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES "${WEBKIT2_DIR}/WebProcess/WebPage/mac" "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac" "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore" + "${DERIVED_SOURCES_WEBCORE_DIR}" ) set(XPCService_SOURCES diff --git a/Tools/ChangeLog b/Tools/ChangeLog index ba58825..69672c2 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,10 @@ +2016-12-13 Alex Christensen + + Fix CMake build. + + * DumpRenderTree/PlatformMac.cmake: + Define NS_RETURNS_RETAINED as nothing for now. + 2016-12-13 Jer Noble Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible diff --git a/Tools/DumpRenderTree/PlatformMac.cmake b/Tools/DumpRenderTree/PlatformMac.cmake index 98e48e5..b0fabcc 100644 --- a/Tools/DumpRenderTree/PlatformMac.cmake +++ b/Tools/DumpRenderTree/PlatformMac.cmake @@ -1,7 +1,9 @@ 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) -- 1.8.3.1