Fix cmake build
authorjfbastien@apple.com <jfbastien@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Feb 2017 20:00:52 +0000 (20:00 +0000)
committerjfbastien@apple.com <jfbastien@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Feb 2017 20:00:52 +0000 (20:00 +0000)
https://bugs.webkit.org/show_bug.cgi?id=168665

Reviewed by Mark Lam.

It was broken by r212555 and r212681.

Source/WebKit:

* PlatformMac.cmake:

Tools:

* DumpRenderTree/PlatformMac.cmake:

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

Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Tools/ChangeLog
Tools/DumpRenderTree/PlatformMac.cmake

index 8f470af..4a1b4e7 100644 (file)
@@ -1,3 +1,14 @@
+2017-02-21  JF Bastien  <jfbastien@apple.com>
+
+        Fix cmake build
+        https://bugs.webkit.org/show_bug.cgi?id=168665
+
+        Reviewed by Mark Lam.
+
+        It was broken by r212555 and r212681.
+
+        * PlatformMac.cmake:
+
 2017-02-20  Alexey Proskuryakov  <ap@apple.com>
 
         List of WebCore symbols to re-export from WebKitLegacy should be built automatically
index e3f86c1..9733c9f 100644 (file)
@@ -188,7 +188,7 @@ list(APPEND WebKit_SOURCES
     mac/Misc/WebKitLogging.m
     mac/Misc/WebKitNSStringExtras.mm
     mac/Misc/WebKitStatistics.m
-    mac/Misc/WebKitVersionChecks.m
+    mac/Misc/WebKitVersionChecks.mm
     mac/Misc/WebLocalizableStrings.mm
     mac/Misc/WebLocalizableStringsInternal.mm
     mac/Misc/WebNSControlExtras.m
@@ -372,7 +372,6 @@ set(C99_FILES
     mac/Misc/WebKitLogging.m
     mac/Misc/WebKitStatistics.m
     mac/Misc/WebKitSystemBits.m
-    mac/Misc/WebKitVersionChecks.m
     mac/Misc/WebNSArrayExtras.m
     mac/Misc/WebNSControlExtras.m
     mac/Misc/WebNSDataExtras.m
index c9219f7..2f30294 100644 (file)
@@ -1,3 +1,14 @@
+2017-02-21  JF Bastien  <jfbastien@apple.com>
+
+        Fix cmake build
+        https://bugs.webkit.org/show_bug.cgi?id=168665
+
+        Reviewed by Mark Lam.
+
+        It was broken by r212555 and r212681.
+
+        * DumpRenderTree/PlatformMac.cmake:
+
 2017-02-21  Alexey Proskuryakov  <ap@apple.com>
 
         Improve bot watcher's dashboard performance
index 2152fef..a71b1fe 100644 (file)
@@ -73,7 +73,6 @@ list(APPEND DumpRenderTree_ObjC_SOURCES
     DumpRenderTreeFileDraggingSource.m
 
     mac/AppleScriptController.m
-    mac/DumpRenderTreePasteboard.m
     mac/NavigationController.m
     mac/ObjCController.m
     mac/ObjCPlugin.m
@@ -96,6 +95,7 @@ list(APPEND DumpRenderTree_ObjCpp_SOURCES
     mac/DumpRenderTree.mm
     mac/DumpRenderTreeDraggingInfo.mm
     mac/DumpRenderTreeMain.mm
+    mac/DumpRenderTreePasteboard.mm
     mac/DumpRenderTreeSpellChecker.mm
     mac/DumpRenderTreeWindow.mm
     mac/EditingDelegate.mm