Fix CMake build.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Dec 2016 02:39:39 +0000 (02:39 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Dec 2016 02:39:39 +0000 (02:39 +0000)
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
Source/WebKit2/PlatformMac.cmake
Tools/ChangeLog
Tools/DumpRenderTree/PlatformMac.cmake

index 2e61059..7c6eb1c 100644 (file)
@@ -1,3 +1,9 @@
+2016-12-13  Alex Christensen  <achristensen@webkit.org>
+
+        Fix CMake build.
+
+        * PlatformMac.cmake:
+
 2016-12-13  Jer Noble  <jer.noble@apple.com>
 
         Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible
index bc63ffe..c75daee 100644 (file)
@@ -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
index ba58825..69672c2 100644 (file)
@@ -1,3 +1,10 @@
+2016-12-13  Alex Christensen  <achristensen@webkit.org>
+
+        Fix CMake build.
+
+        * DumpRenderTree/PlatformMac.cmake:
+        Define NS_RETURNS_RETAINED as nothing for now.
+
 2016-12-13  Jer Noble  <jer.noble@apple.com>
 
         Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible
index 98e48e5..b0fabcc 100644 (file)
@@ -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)