commit 1629363223f203c9cc9de9d6c4f86a1e1f3a4ddd
author achristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Nov 02 22:55:40 2015 +0000
committer achristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Nov 02 22:55:40 2015 +0000
tree c7660db932ca56f1162c80b13d07f877a9b57176
parent 3a439f4c8dc012f25b0bb5c73133ca4813ec9791

Fix Mac CMake build after r191904.

* PlatformMac.cmake:
Move SettingsMac.mm to SettingsCocoa.mm.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@191912 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f6186b7..18a497c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-02  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build after r191904.
+
+        * PlatformMac.cmake:
+        Move SettingsMac.mm to SettingsCocoa.mm.
+
 2015-11-02  Eric Carlson  <eric.carlson@apple.com>
 
         Add HTMLMediaElement behavior and attribute value restrictions for MediaStream

Source/WebCore/PlatformMac.cmake

diff --git a/Source/WebCore/PlatformMac.cmake b/Source/WebCore/PlatformMac.cmake
index 5c206f0..ff8a46e 100644
--- a/Source/WebCore/PlatformMac.cmake
+++ b/Source/WebCore/PlatformMac.cmake
@@ -270,13 +270,13 @@
 
     page/cocoa/UserAgent.mm
     page/cocoa/ResourceUsageOverlayCocoa.mm
+    page/cocoa/SettingsCocoa.mm
 
     page/mac/ChromeMac.mm
     page/mac/DragControllerMac.mm
     page/mac/EventHandlerMac.mm
     page/mac/PageMac.mm
     page/mac/ServicesOverlayController.mm
-    page/mac/SettingsMac.mm
     page/mac/TextIndicatorWindow.mm
     page/mac/UserAgentMac.mm
     page/mac/WheelEventDeltaFilterMac.mm