Compile and link with CMake on Mac
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Oct 2015 19:34:29 +0000 (19:34 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Oct 2015 19:34:29 +0000 (19:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150632

Reviewed by Tim Horton.

.:

* Source/cmake/OptionsMac.cmake:

Source/WebKit:

* PlatformMac.cmake:

Source/WebKit2:

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:

Tools:

* TestWebKitAPI/PlatformMac.cmake:

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

ChangeLog
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformEfl.cmake
Source/WebKit2/PlatformGTK.cmake
Source/WebKit2/PlatformMac.cmake
Source/cmake/OptionsMac.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/PlatformMac.cmake

index eaff0e4..fd522e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-10-28  Alex Christensen  <achristensen@webkit.org>
+
+        Compile and link with CMake on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=150632
+
+        Reviewed by Tim Horton.
+
+        * Source/cmake/OptionsMac.cmake:
+
 2015-10-26  Dana Burkart  <dburkart@apple.com>
 
         `make analyze` should build using the debug configuration
index ab2e6f9..9b2221e 100644 (file)
@@ -1,3 +1,12 @@
+2015-10-28  Alex Christensen  <achristensen@webkit.org>
+
+        Compile and link with CMake on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=150632
+
+        Reviewed by Tim Horton.
+
+        * PlatformMac.cmake:
+
 2015-10-23  Alex Christensen  <achristensen@webkit.org>
 
         Progress towards CMake on Mac
index 8372768..4597dc6 100644 (file)
@@ -333,8 +333,6 @@ set(C99_FILES
     mac/DefaultDelegates/WebDefaultPolicyDelegate.m
     mac/DefaultDelegates/WebDefaultUIDelegate.m
 
-    mac/History/WebURLsWithTitles.m
-
     mac/Misc/OldWebAssertions.c
 
     mac/Misc/WebKitErrors.m
@@ -369,7 +367,7 @@ set(C99_FILES
 foreach (_file ${WebKit_SOURCES})
     list(FIND C99_FILES ${_file} _c99_index)
     if (${_c99_index} EQUAL -1)
-        set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -ObjC++)
+        set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++11")
     else ()
         set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c99)
     endif ()
index 6289a3c..42d2be9 100644 (file)
@@ -494,8 +494,6 @@ set(WebKit2_SOURCES
     UIProcess/WebsiteData/WebsiteDataRecord.cpp
     UIProcess/WebsiteData/WebsiteDataStore.cpp
 
-    UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
-
     WebProcess/WebConnectionToUIProcess.cpp
     WebProcess/WebProcess.cpp
 
index d0cadc5..28177d4 100644 (file)
@@ -1,3 +1,15 @@
+2015-10-28  Alex Christensen  <achristensen@webkit.org>
+
+        Compile and link with CMake on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=150632
+
+        Reviewed by Tim Horton.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+
 2015-10-27  Anders Carlsson  <andersca@apple.com>
 
         Stub out more of the context menu SPI
index 8f824cd..83e2ee9 100644 (file)
@@ -145,6 +145,8 @@ list(APPEND WebKit2_SOURCES
 
     UIProcess/Storage/StorageManager.cpp
 
+    UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
+
     UIProcess/cairo/BackingStoreCairo.cpp
 
     UIProcess/efl/BatteryProvider.cpp
index 1eda535..2201e88 100644 (file)
@@ -290,6 +290,8 @@ list(APPEND WebKit2_SOURCES
 
     UIProcess/Storage/StorageManager.cpp
 
+    UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
+
     UIProcess/cairo/BackingStoreCairo.cpp
 
     UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp
index ba6abf4..356f2fd 100644 (file)
@@ -1,4 +1,4 @@
-add_definitions(-ObjC++)
+add_definitions("-ObjC++ -std=c++11")
 
 if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
@@ -81,6 +81,8 @@ list(APPEND WebKit2_SOURCES
     Platform/mac/SharedMemoryMac.cpp
     Platform/mac/StringUtilities.mm
 
+    Platform/unix/EnvironmentUtilities.cpp
+
     PluginProcess/mac/PluginControllerProxyMac.mm
     PluginProcess/mac/PluginProcessMac.mm
     PluginProcess/mac/PluginProcessShim.mm
@@ -176,6 +178,7 @@ list(APPEND WebKit2_SOURCES
     UIProcess/ViewGestureController.cpp
 
     UIProcess/API/APIUserScript.cpp
+    UIProcess/API/APIUserStyleSheet.cpp
     UIProcess/API/APIWebsiteDataRecord.cpp
 
     UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
@@ -215,6 +218,7 @@ list(APPEND WebKit2_SOURCES
     UIProcess/API/Cocoa/_WKThumbnailView.mm
     UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
     UIProcess/API/Cocoa/_WKUserContentFilter.mm
+    UIProcess/API/Cocoa/_WKUserStyleSheet.mm
     UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
     UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
 
@@ -255,6 +259,8 @@ list(APPEND WebKit2_SOURCES
 
     UIProcess/Storage/StorageManager.cpp
 
+    UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm
+
     UIProcess/mac/CorrectionPanel.mm
     UIProcess/mac/LegacySessionStateCoding.cpp
     UIProcess/mac/PageClientImpl.mm
@@ -389,6 +395,7 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
     "${WEBKIT2_DIR}/Shared/API/c/mac"
     "${WEBKIT2_DIR}/Shared/cf"
     "${WEBKIT2_DIR}/Shared/Cocoa"
+    "${WEBKIT2_DIR}/Shared/EntryPointUtilities/mac/XPCService"
     "${WEBKIT2_DIR}/Shared/mac"
     "${WEBKIT2_DIR}/Shared/Plugins/mac"
     "${WEBKIT2_DIR}/Shared/Scrolling"
@@ -416,20 +423,30 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
 set(WEBKIT2_EXTRA_DEPENDENCIES
      WebKit2-forwarding-headers
 )
+
+set(XPCService_SOURCES
+    Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
+    Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm
+)
+
 set(WebProcess_SOURCES
     WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
+    ${XPCService_SOURCES}
 )
 
 set(PluginProcess_SOURCES
     PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm
+    ${XPCService_SOURCES}
 )
 
 list(APPEND NetworkProcess_SOURCES
-     ${NetworkProcess_COMMON_SOURCES}
+    NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm
+    ${XPCService_SOURCES}
 )
 
 list(APPEND DatabaseProcess_SOURCES
     DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm
+    ${XPCService_SOURCES}
 )
 
 add_definitions("-include WebKit2Prefix.h")
@@ -460,12 +477,15 @@ set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
     Shared/API/Cocoa
     Shared/API/c
 
+    Shared/API/c/cf
+
     Shared/API/c/mac
 
     UIProcess/Cocoa
 
     UIProcess/API/C
     UIProcess/API/Cocoa
+    UIProcess/API/cpp
 
     WebProcess/WebPage
 
index 81cdf8a..4660958 100644 (file)
@@ -5,6 +5,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING PRIVATE O
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphoneos PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphonesimulator PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS_macosx PRIVATE ON)
index 2e7ca64..a4405db 100644 (file)
@@ -1,3 +1,12 @@
+2015-10-28  Alex Christensen  <achristensen@webkit.org>
+
+        Compile and link with CMake on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=150632
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/PlatformMac.cmake:
+
 2015-10-28  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 
         Unreviewed.
index ad2ae92..fe6f07e 100644 (file)
@@ -13,9 +13,20 @@ set(test_main_SOURCES
 find_library(CARBON_LIBRARY Carbon)
 find_library(COCOA_LIBRARY Cocoa)
 find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+link_directories(${CMAKE_SOURCE_DIR}/WebKitLibraries)
 list(APPEND test_wtf_LIBRARIES
     ${CARBON_LIBRARY}
     ${COCOA_LIBRARY}
     ${COREFOUNDATION_LIBRARY}
     libicucore.dylib
 )
+
+set(bundle_harness_SOURCES
+    ${TESTWEBKITAPI_DIR}/cocoa/PlatformUtilitiesCocoa.mm
+    ${TESTWEBKITAPI_DIR}/mac/InjectedBundleControllerMac.mm
+    ${TESTWEBKITAPI_DIR}/mac/InstanceMethodSwizzler.mm
+    ${TESTWEBKITAPI_DIR}/mac/PlatformUtilitiesMac.mm
+    ${TESTWEBKITAPI_DIR}/mac/PlatformWebViewMac.mm
+    ${TESTWEBKITAPI_DIR}/mac/SyntheticBackingScaleFactorWindow.m
+    ${TESTWEBKITAPI_DIR}/mac/TestBrowsingContextLoadDelegate.mm
+)