Title: [197166] trunk/Source/WebKit
Revision
197166
Author
[email protected]
Date
2016-02-26 08:47:29 -0800 (Fri, 26 Feb 2016)

Log Message

[cmake] Moved WebKit/Storage sources and include dir to CMakeLists.txt.
https://bugs.webkit.org/show_bug.cgi?id=154722

Patch by Konstantin Tokarev <[email protected]> on 2016-02-26
Reviewed by Darin Adler.

This code provides port-independent layer used by all WK1 ports,
so it belongs to main CMakeLists.txt, not Platform files.

* CMakeLists.txt:
* PlatformMac.cmake:
* PlatformWin.cmake:

Modified Paths

Diff

Modified: trunk/Source/WebKit/CMakeLists.txt (197165 => 197166)


--- trunk/Source/WebKit/CMakeLists.txt	2016-02-26 14:57:01 UTC (rev 197165)
+++ trunk/Source/WebKit/CMakeLists.txt	2016-02-26 16:47:29 UTC (rev 197166)
@@ -2,12 +2,23 @@
 include(WebKitCommon)
 
 set(WebKit_SOURCES
+    Storage/StorageAreaImpl.cpp
+    Storage/StorageAreaSync.cpp
+    Storage/StorageNamespaceImpl.cpp
+    Storage/StorageSyncManager.cpp
+    Storage/StorageThread.cpp
+    Storage/StorageTracker.cpp
+    Storage/WebDatabaseProvider.cpp
+    Storage/WebStorageNamespaceProvider.cpp
+
     WebCoreSupport/WebResourceLoadScheduler.cpp
     WebCoreSupport/WebViewGroup.cpp
 )
 
 set(WebKit_INCLUDE_DIRECTORIES
+    Storage
     WebCoreSupport
+
     "${CMAKE_BINARY_DIR}"
     "${CMAKE_SOURCE_DIR}/Source"
     "${DERIVED_SOURCES_DIR}"

Modified: trunk/Source/WebKit/ChangeLog (197165 => 197166)


--- trunk/Source/WebKit/ChangeLog	2016-02-26 14:57:01 UTC (rev 197165)
+++ trunk/Source/WebKit/ChangeLog	2016-02-26 16:47:29 UTC (rev 197166)
@@ -1,3 +1,17 @@
+2016-02-26  Konstantin Tokarev  <[email protected]>
+
+        [cmake] Moved WebKit/Storage sources and include dir to CMakeLists.txt.
+        https://bugs.webkit.org/show_bug.cgi?id=154722
+
+        Reviewed by Darin Adler.
+
+        This code provides port-independent layer used by all WK1 ports,
+        so it belongs to main CMakeLists.txt, not Platform files.
+
+        * CMakeLists.txt:
+        * PlatformMac.cmake:
+        * PlatformWin.cmake:
+
 2016-02-25  Brady Eidson  <[email protected]>
 
         Remove LegacyIDB.

Modified: trunk/Source/WebKit/PlatformMac.cmake (197165 => 197166)


--- trunk/Source/WebKit/PlatformMac.cmake	2016-02-26 14:57:01 UTC (rev 197165)
+++ trunk/Source/WebKit/PlatformMac.cmake	2016-02-26 16:47:29 UTC (rev 197166)
@@ -57,21 +57,11 @@
     mac/WebCoreSupport
     mac/WebInspector
     mac/WebView
-    Storage
 )
 
 list(APPEND WebKit_SOURCES
     cf/WebCoreSupport/WebInspectorClientCF.cpp
 
-    Storage/StorageAreaImpl.cpp
-    Storage/StorageAreaSync.cpp
-    Storage/StorageNamespaceImpl.cpp
-    Storage/StorageSyncManager.cpp
-    Storage/StorageThread.cpp
-    Storage/StorageTracker.cpp
-    Storage/WebDatabaseProvider.cpp
-    Storage/WebStorageNamespaceProvider.cpp
-
     mac/Carbon/CarbonUtils.m
     mac/Carbon/CarbonWindowAdapter.mm
     mac/Carbon/CarbonWindowContentView.m

Modified: trunk/Source/WebKit/PlatformWin.cmake (197165 => 197166)


--- trunk/Source/WebKit/PlatformWin.cmake	2016-02-26 14:57:01 UTC (rev 197165)
+++ trunk/Source/WebKit/PlatformWin.cmake	2016-02-26 16:47:29 UTC (rev 197166)
@@ -48,7 +48,6 @@
     "${CMAKE_BINARY_DIR}/../include/private"
     "${CMAKE_BINARY_DIR}/../include/private/_javascript_Core"
     "${CMAKE_BINARY_DIR}/../include/private/WebCore"
-    Storage
     win
     win/plugins
     win/WebCoreSupport
@@ -135,15 +134,6 @@
 )
 
 list(APPEND WebKit_SOURCES_Classes
-    Storage/StorageAreaImpl.cpp
-    Storage/StorageAreaSync.cpp
-    Storage/StorageNamespaceImpl.cpp
-    Storage/StorageSyncManager.cpp
-    Storage/StorageThread.cpp
-    Storage/StorageTracker.cpp
-    Storage/WebDatabaseProvider.cpp
-    Storage/WebStorageNamespaceProvider.cpp
-
     cf/WebCoreSupport/WebInspectorClientCF.cpp
 
     win/AccessibleBase.cpp
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to