Changeset 250591 in webkit


Ignore:
Timestamp:
Oct 1, 2019 8:12:49 PM (5 years ago)
Author:
achristensen@apple.com
Message:

Progress towards a functioning CMake build on Mac
​https://bugs.webkit.org/show_bug.cgi?id=202443

Rubber-stamped by Tim Horton.

Source/WebCore:

  • testing/Internals.mm:

Source/WebCore/PAL:

  • pal/PlatformMac.cmake:

Source/WebKit:

  • CMakeLists.txt:
  • PlatformMac.cmake:

Tools:

  • DumpRenderTree/PlatformMac.cmake:
  • MiniBrowser/mac/CMakeLists.txt:
  • TestRunnerShared/cocoa/ClassMethodSwizzler.mm:
  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/PlatformMac.cmake:
  • WebKitTestRunner/PlatformMac.cmake:
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r250589 r250591  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards a functioning CMake build on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=202443
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * testing/Internals.mm:
     9
    1102019-10-01  John Wilander  <wilander@apple.com>
    211

  • trunk/Source/WebCore/PAL/ChangeLog

    r250579 r250591  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards a functioning CMake build on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=202443
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * pal/PlatformMac.cmake:
     9
    1102019-10-01  Alex Christensen  <achristensen@webkit.org>
    211

  • trunk/Source/WebCore/PAL/pal/PlatformMac.cmake

    r250579 r250591  
    2828    spi/cocoa/CoreTextSPI.h
    2929    spi/cocoa/DataDetectorsCoreSPI.h
     30    spi/cocoa/IOKitSPI.h
    3031    spi/cocoa/IOPMLibSPI.h
    3132    spi/cocoa/IOPSLibSPI.h

  • trunk/Source/WebCore/testing/Internals.mm

    r247698 r250591  
    3636#import "Range.h"
    3737#import <AVFoundation/AVPlayer.h>
     38#import <wtf/cocoa/NSURLExtras.h>
     39
     40#if PLATFORM(IOS_FAMILY)
    3841#import <pal/ios/UIKitSoftLink.h>
    39 #import <wtf/cocoa/NSURLExtras.h>
     42#endif
    4043
    4144namespace WebCore {

  • trunk/Source/WebKit/CMakeLists.txt

    r248888 r250591  
    217217else ()
    218218    # All users of WebKit need to link WebCore if WebCore is a shared library.
    219     set(WebKit_LIBRARIES PUBLIC WebCore)
     219    if (APPLE)
     220        set(WebKit_LIBRARIES PRIVATE WebCore)
     221    else ()
     222        set(WebKit_LIBRARIES PUBLIC WebCore)
     223    endif ()
    220224endif ()
    221225
    … …  
    423427ADD_WEBKIT_PREFIX_HEADER(WebProcess)
    424428target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
     429target_include_directories(WebProcess PRIVATE ${WebProcess_INCLUDE_DIRECTORIES})
    425430
    426431if (WebKit_WebProcess_OUTPUT_NAME)
    … …  
    431436ADD_WEBKIT_PREFIX_HEADER(NetworkProcess)
    432437target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
     438target_include_directories(NetworkProcess PRIVATE ${NetworkProcess_INCLUDE_DIRECTORIES})
    433439
    434440if (WebKit_NetworkProcess_OUTPUT_NAME)
    … …  
    448454    ADD_WEBKIT_PREFIX_HEADER(PluginProcess)
    449455    target_link_libraries(PluginProcess ${PluginProcess_LIBRARIES})
     456    target_include_directories(PluginProcess PRIVATE ${PluginProcess_INCLUDE_DIRECTORIES})
    450457    install(TARGETS PluginProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
    451458

  • trunk/Source/WebKit/ChangeLog

    r250589 r250591  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards a functioning CMake build on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=202443
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * CMakeLists.txt:
     9        * PlatformMac.cmake:
     10
    1112019-10-01  John Wilander  <wilander@apple.com>
    212

  • trunk/Source/WebKit/PlatformMac.cmake

    r250579 r250591  
    2424
    2525list(APPEND WebKit_SOURCES
    26     NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
    27     NetworkProcess/Classifier/WebResourceLoadStatisticsTelemetry.cpp
    28 
    2926    NetworkProcess/cocoa/WebSocketTaskCocoa.mm
    3027
    31     NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
    32 
    33     NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
    34 
    35     NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm
    36 
    37     NetworkProcess/Downloads/PendingDownload.cpp
    38 
    39     NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
    4028    NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm
    4129
    42     NetworkProcess/WebStorage/StorageManager.cpp
    43 
    44     NetworkProcess/cache/NetworkCacheDataCocoa.mm
    45     NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm
    46 
    47     NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
    48     NetworkProcess/cocoa/NetworkProcessCocoa.mm
    49     NetworkProcess/cocoa/NetworkSessionCocoa.mm
    50 
    51     NetworkProcess/mac/NetworkProcessMac.mm
    52     NetworkProcess/mac/RemoteNetworkingContext.mm
    53 
    54     Platform/IPC/cocoa/ConnectionCocoa.mm
    55     Platform/IPC/cocoa/MachMessage.cpp
    56 
    57     Platform/cf/ModuleCF.cpp
    58 
    59     Platform/cg/CGUtilities.cpp
    60 
    61     Platform/cocoa/WKCrashReporter.mm
    62 
    63     Platform/classifier/ResourceLoadStatisticsClassifier.cpp
    64 
    65     Platform/classifier/cocoa/ResourceLoadStatisticsClassifierCocoa.cpp
    66 
    67     Platform/foundation/LoggingFoundation.mm
    68 
    69     Platform/cocoa/SharedMemoryCocoa.cpp
    70 
    71     Platform/mac/LayerHostingContext.mm
    72     Platform/mac/MachUtilities.cpp
    73     Platform/mac/MenuUtilities.mm
    74     Platform/mac/StringUtilities.mm
    75 
    76     Platform/unix/EnvironmentUtilities.cpp
    77 
    78     PluginProcess/mac/PluginControllerProxyMac.mm
    79     PluginProcess/mac/PluginProcessMac.mm
    80     PluginProcess/mac/PluginProcessShim.mm
    81 
    82     Shared/APIWebArchive.mm
    83     Shared/APIWebArchiveResource.mm
    84 
    85     Shared/API/Cocoa/RemoteObjectInvocation.mm
    86     Shared/API/Cocoa/RemoteObjectRegistry.mm
    87     Shared/API/Cocoa/WKBrowsingContextHandle.mm
    88     Shared/API/Cocoa/WKRemoteObject.mm
    89     Shared/API/Cocoa/WKRemoteObjectCoder.mm
    90     Shared/API/Cocoa/WebKit.m
    91     Shared/API/Cocoa/_WKFrameHandle.mm
    92     Shared/API/Cocoa/_WKHitTestResult.mm
    93     Shared/API/Cocoa/_WKNSFileManagerExtras.mm
    94     Shared/API/Cocoa/_WKRemoteObjectInterface.mm
    95     Shared/API/Cocoa/_WKRemoteObjectRegistry.mm
    96 
    97     Shared/API/c/cf/WKErrorCF.cpp
    98     Shared/API/c/cf/WKStringCF.mm
    99     Shared/API/c/cf/WKURLCF.mm
    100 
    101     Shared/API/c/cg/WKImageCG.cpp
    102 
    103     Shared/API/c/mac/WKCertificateInfoMac.mm
    104     Shared/API/c/mac/WKObjCTypeWrapperRef.mm
    105     Shared/API/c/mac/WKURLRequestNS.mm
    106     Shared/API/c/mac/WKURLResponseNS.mm
    107     Shared/API/c/mac/WKWebArchive.cpp
    108     Shared/API/c/mac/WKWebArchiveResource.cpp
    109 
    110     Shared/Cocoa/APIDataCocoa.mm
    111     Shared/Cocoa/APIObject.mm
    112     Shared/Cocoa/AuxiliaryProcessCocoa.mm
    113     Shared/Cocoa/CompletionHandlerCallChecker.mm
    114     Shared/Cocoa/DataDetectionResult.mm
    115     Shared/Cocoa/LoadParametersCocoa.mm
    116     Shared/Cocoa/SandboxExtensionCocoa.mm
    117     Shared/Cocoa/WKNSArray.mm
    118     Shared/Cocoa/WKNSData.mm
    119     Shared/Cocoa/WKNSDictionary.mm
    120     Shared/Cocoa/WKNSError.mm
    121     Shared/Cocoa/WKNSNumber.mm
    122     Shared/Cocoa/WKNSString.mm
    123     Shared/Cocoa/WKNSURL.mm
    124     Shared/Cocoa/WKNSURLExtras.mm
    125     Shared/Cocoa/WKNSURLRequest.mm
    126     Shared/Cocoa/WKObject.mm
    127     Shared/Cocoa/WebErrorsCocoa.mm
    128     Shared/Cocoa/WebKit2InitializeCocoa.mm
    129 
    130     Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
    131     Shared/Plugins/Netscape/mac/PluginInformationMac.mm
    132 
    133     Shared/Plugins/mac/PluginSandboxProfile.mm
    134 
    135     Shared/RemoteLayerTree/RemoteLayerBackingStore.mm
    136     Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.mm
    137     Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm
    138     Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm
    139     Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
    140 
    141     Shared/cf/ArgumentCodersCF.cpp
    142     Shared/cf/CookieStorageUtilsCF.mm
    143 
    144     Shared/cg/ShareableBitmapCG.cpp
    145 
    146     Shared/mac/AttributedString.mm
    147     Shared/mac/AuxiliaryProcessMac.mm
    148     Shared/mac/CodeSigning.mm
    149     Shared/mac/ColorSpaceData.mm
    150     Shared/mac/HangDetectionDisablerMac.mm
    151     Shared/mac/NativeWebGestureEventMac.mm
    152     Shared/mac/NativeWebKeyboardEventMac.mm
    153     Shared/mac/NativeWebMouseEventMac.mm
    154     Shared/mac/NativeWebWheelEventMac.mm
    155     Shared/mac/ObjCObjectGraph.mm
    156     Shared/mac/PDFKitImports.mm
    157     Shared/mac/PasteboardTypes.mm
    158     Shared/mac/PrintInfoMac.mm
    159     Shared/mac/SecItemRequestData.cpp
    160     Shared/mac/SecItemResponseData.cpp
    161     Shared/mac/SecItemShim.cpp
    162     Shared/mac/WebCoreArgumentCodersMac.mm
    163     Shared/mac/WebEventFactory.mm
    164     Shared/mac/WebGestureEvent.cpp
    165     Shared/mac/WebHitTestResultData.mm
    166     Shared/mac/WebMemorySampler.mac.mm
    167 
    168     UIProcess/HighPerformanceGraphicsUsageSampler.cpp
    169     UIProcess/PerActivityStateCPUUsageSampler.cpp
    170     UIProcess/ViewGestureController.cpp
    171     UIProcess/ViewSnapshotStore.cpp
    172 
    173     UIProcess/Automation/WebAutomationSession.cpp
    174 
    175     UIProcess/Automation/cocoa/WebAutomationSessionCocoa.mm
    176 
    177     UIProcess/Automation/mac/WebAutomationSessionMac.mm
    178 
    179     UIProcess/API/APIUserScript.cpp
    180     UIProcess/API/APIUserStyleSheet.cpp
    181     UIProcess/API/APIWebsiteDataRecord.cpp
    182 
    183     UIProcess/API/C/mac/WKContextPrivateMac.mm
    184     UIProcess/API/C/mac/WKPagePrivateMac.mm
    185 
    186     UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm
    187     UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
    188     UIProcess/API/Cocoa/LegacyBundleForClass.mm
    189     UIProcess/API/Cocoa/WKBackForwardList.mm
    190     UIProcess/API/Cocoa/WKBackForwardListItem.mm
    191     UIProcess/API/Cocoa/WKBrowsingContextController.mm
    192     UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
    193     UIProcess/API/Cocoa/WKConnection.mm
    194     UIProcess/API/Cocoa/WKContentRuleList.mm
    195     UIProcess/API/Cocoa/WKContentRuleListStore.mm
    196     UIProcess/API/Cocoa/WKError.mm
    197     UIProcess/API/Cocoa/WKFrameInfo.mm
    198     UIProcess/API/Cocoa/WKHTTPCookieStore.mm
    199     UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm
    200     UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
    201     UIProcess/API/Cocoa/WKNavigation.mm
    202     UIProcess/API/Cocoa/WKNavigationAction.mm
    203     UIProcess/API/Cocoa/WKNavigationData.mm
    204     UIProcess/API/Cocoa/WKNavigationResponse.mm
    205     UIProcess/API/Cocoa/WKOpenPanelParameters.mm
    206     UIProcess/API/Cocoa/WKPreferences.mm
    207     UIProcess/API/Cocoa/WKPreviewActionItem.mm
    208     UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.mm
    209     UIProcess/API/Cocoa/WKPreviewElementInfo.mm
    210     UIProcess/API/Cocoa/WKProcessGroup.mm
    211     UIProcess/API/Cocoa/WKProcessPool.mm
    212     UIProcess/API/Cocoa/WKScriptMessage.mm
    213     UIProcess/API/Cocoa/WKSecurityOrigin.mm
    214     UIProcess/API/Cocoa/WKTypeRefWrapper.mm
    215     UIProcess/API/Cocoa/WKURLSchemeTask.mm
    216     UIProcess/API/Cocoa/WKUserContentController.mm
    217     UIProcess/API/Cocoa/WKUserScript.mm
    218     UIProcess/API/Cocoa/WKWebView.mm
    219     UIProcess/API/Cocoa/WKWebViewConfiguration.mm
    220     UIProcess/API/Cocoa/WKWebsiteDataRecord.mm
    221     UIProcess/API/Cocoa/WKWebsiteDataStore.mm
    222     UIProcess/API/Cocoa/WKWindowFeatures.mm
    223     UIProcess/API/Cocoa/_WKActivatedElementInfo.mm
    224     UIProcess/API/Cocoa/_WKApplicationManifest.mm
    225     UIProcess/API/Cocoa/_WKAttachment.mm
    226     UIProcess/API/Cocoa/_WKAutomationSession.mm
    227     UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm
    228     UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
    229     UIProcess/API/Cocoa/_WKDownload.mm
    230     UIProcess/API/Cocoa/_WKElementAction.mm
    231     UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.mm
    232     UIProcess/API/Cocoa/_WKExperimentalFeature.mm
    233     UIProcess/API/Cocoa/_WKLinkIconParameters.mm
    234     UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
    235     UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm
    236     UIProcess/API/Cocoa/_WKSessionState.mm
    237     UIProcess/API/Cocoa/_WKThumbnailView.mm
    238     UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
    239     UIProcess/API/Cocoa/_WKUserContentFilter.mm
    240     UIProcess/API/Cocoa/_WKUserContentWorld.mm
    241     UIProcess/API/Cocoa/_WKUserInitiatedAction.mm
    242     UIProcess/API/Cocoa/_WKUserStyleSheet.mm
    243     UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
    244     UIProcess/API/Cocoa/_WKWebsiteDataSize.mm
    245     UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
    246     UIProcess/API/Cocoa/_WKWebsitePolicies.mm
    247 
    248     UIProcess/API/mac/WKView.mm
    249 
    250     UIProcess/Cocoa/AutomationClient.mm
    251     UIProcess/Cocoa/AutomationSessionClient.mm
    252     UIProcess/Cocoa/DiagnosticLoggingClient.mm
    253     UIProcess/Cocoa/DownloadClient.mm
    254     UIProcess/Cocoa/FindClient.mm
    255     UIProcess/Cocoa/FullscreenClient.mm
    256     UIProcess/Cocoa/IconLoadingDelegate.mm
    257     UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm
    258     UIProcess/Cocoa/NavigationState.mm
    259     UIProcess/Cocoa/PageClientImplCocoa.mm
    260     UIProcess/Cocoa/SessionStateCoding.mm
    261     UIProcess/Cocoa/UIDelegate.mm
    262     UIProcess/Cocoa/UIRemoteObjectRegistry.cpp
    263     UIProcess/Cocoa/VersionChecks.mm
    264     UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm
    265     UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm
     30    Shared/API/Cocoa/WKMain.mm
     31
    26632    UIProcess/Cocoa/WKSafeBrowsingWarning.mm
    26733    UIProcess/Cocoa/WKShareSheet.mm
    268     UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
    269     UIProcess/Cocoa/WebPageProxyCocoa.mm
    270     UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
    271     UIProcess/Cocoa/WebProcessPoolCocoa.mm
    272     UIProcess/Cocoa/WebProcessProxyCocoa.mm
    273     UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm
    274     UIProcess/Cocoa/WebViewImpl.mm
    275 
    276     UIProcess/Launcher/mac/ProcessLauncherMac.mm
    277 
    278     UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp
    279 
    280     UIProcess/Plugins/mac/PluginInfoStoreMac.mm
    281     UIProcess/Plugins/mac/PluginProcessManagerMac.mm
    282     UIProcess/Plugins/mac/PluginProcessProxyMac.mm
    283 
    284     UIProcess/RemoteLayerTree/RemoteLayerTreeScrollingPerformanceData.mm
    285     UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
    286     UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp
    287     UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm
    288     UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm
    289 
    290     UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm
    291 
    292     UIProcess/mac/CorrectionPanel.mm
    293     UIProcess/mac/LegacySessionStateCoding.cpp
    294     UIProcess/mac/PageClientImplMac.mm
    295     UIProcess/mac/RemoteWebInspectorProxyMac.mm
    296     UIProcess/mac/SecItemShimProxy.cpp
    297     UIProcess/mac/ServicesController.mm
    298     UIProcess/mac/TextCheckerMac.mm
    299     UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
    300     UIProcess/mac/ViewGestureControllerMac.mm
    301     UIProcess/mac/ViewSnapshotStoreMac.mm
    302     UIProcess/mac/WKFullScreenWindowController.mm
    303     UIProcess/mac/WKImmediateActionController.mm
    304     UIProcess/mac/WKInspectorViewController.mm
    305     UIProcess/mac/WKInspectorWKWebView.mm
    306     UIProcess/mac/WKPrintingView.mm
    307     UIProcess/mac/WKSharingServicePickerDelegate.mm
    308     UIProcess/mac/WKTextFinderClient.mm
    309     UIProcess/mac/WKTextInputWindowController.mm
    310     UIProcess/mac/WKViewLayoutStrategy.mm
    311     UIProcess/mac/WebColorPickerMac.mm
    312     UIProcess/mac/WebContextMenuProxyMac.mm
    313     UIProcess/mac/WebCookieManagerProxyMac.mm
    314     UIProcess/mac/WebInspectorProxyMac.mm
    315     UIProcess/mac/WebPageProxyMac.mm
    316     UIProcess/mac/WebPopupMenuProxyMac.mm
    317     UIProcess/mac/WebPreferencesMac.mm
    318     UIProcess/mac/WebProcessProxyMac.mm
    319     UIProcess/mac/WindowServerConnection.mm
    320 
    321     WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.mm
    322     WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm
    323     WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.mm
    324     WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm
    325     WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm
    326     WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm
    327     WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.mm
    328 
    329     WebProcess/InjectedBundle/API/mac/WKDOMDocument.mm
    330     WebProcess/InjectedBundle/API/mac/WKDOMElement.mm
    331     WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm
    332     WebProcess/InjectedBundle/API/mac/WKDOMNode.mm
    333     WebProcess/InjectedBundle/API/mac/WKDOMRange.mm
    334     WebProcess/InjectedBundle/API/mac/WKDOMText.mm
    335     WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm
    336     WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm
    337     WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
    338 
    339     WebProcess/InjectedBundle/mac/InjectedBundleMac.mm
    340 
    341     WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
    342 
    343     WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
    344     WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm
    345 
    346     WebProcess/Plugins/PDF/PDFPlugin.mm
    347     WebProcess/Plugins/PDF/PDFPluginAnnotation.mm
    348     WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm
    349     WebProcess/Plugins/PDF/PDFPluginPasswordField.mm
    350     WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm
    351 
    352     WebProcess/WebPage/RemoteLayerTree/GraphicsLayerCARemote.cpp
    353     WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm
    354     WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.cpp
    355     WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteCustom.mm
    356     WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteTiledBacking.cpp
    357     WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeContext.mm
    358     WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.mm
    359     WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm
    360     WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.mm
    361 
    362     WebProcess/WebCoreSupport/WebPasteboardOverrides.cpp
    363     WebProcess/WebCoreSupport/WebValidationMessageClient.cpp
    364 
    365     WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp
    366     WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm
    367     WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
    368     WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm
    369     WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm
    370     WebProcess/WebCoreSupport/mac/WebPopupMenuMac.mm
    371 
    372     WebProcess/WebPage/ViewGestureGeometryCollector.cpp
    373 
    374     WebProcess/WebPage/Cocoa/WebPageCocoa.mm
    375     WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp
    376 
    377     WebProcess/WebPage/mac/PageBannerMac.mm
    378     WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
    379     WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm
    380     WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm
    381     WebProcess/WebPage/mac/WebInspectorUIMac.mm
    382     WebProcess/WebPage/mac/WebPageMac.mm
    383 
    384     WebProcess/cocoa/WebProcessCocoa.mm
    385 
    386     WebProcess/mac/SecItemShimLibrary.mm
    387 )
    388 
    389 list(APPEND WebKit_INCLUDE_DIRECTORIES
     34    UIProcess/Cocoa/WKStorageAccessAlert.mm
     35)
     36
     37list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
     38    "${ICU_INCLUDE_DIRS}"
    39039    "${WEBKIT_DIR}/NetworkProcess/cocoa"
    39140    "${WEBKIT_DIR}/NetworkProcess/mac"
    … …  
    44190
    44291set(XPCService_SOURCES
     92    Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp
     93
    44394    Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm
    44495    Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm
    … …  
    464115set(WebKit_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)
    465116
     117set(WebProcess_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR})
     118set(NetworkProcess_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR})
     119set(PluginProcess_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR})
     120
    466121add_definitions("-include WebKit2Prefix.h")
    467122
    … …  
    521176    Shared/API/c/mac
    522177
    523     UIProcess
    524178    UIProcess/Cocoa
    525179
    … …  
    529183    UIProcess/API/C/mac
    530184    UIProcess/API/cpp
    531 
    532     WebProcess/WebPage
    533185
    534186    WebProcess/InjectedBundle/API/Cocoa
    … …  
    584236    WebHistoryPrivate.h
    585237    WebIconDatabasePrivate.h
     238    WebInspector.h
    586239    WebInspectorPrivate.h
    587240    WebKitNSStringExtras.h
    … …  
    799452        ${WebKit_NetworkProcess_OUTPUT_NAME})
    800453
    801     add_custom_target(WebContentProcessNib COMMAND
     454    add_custom_command(OUTPUT ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib COMMAND
    802455        ibtool --compile ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib ${WEBKIT_DIR}/Resources/WebContentProcess.xib
    803456        VERBATIM)
     457    add_custom_target(WebContentProcessNib ALL DEPENDS ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib)
    804458    add_dependencies(WebKit WebContentProcessNib)
    805459endfunction()

  • trunk/Tools/ChangeLog

    r250589 r250591  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards a functioning CMake build on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=202443
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * DumpRenderTree/PlatformMac.cmake:
     9        * MiniBrowser/mac/CMakeLists.txt:
     10        * TestRunnerShared/cocoa/ClassMethodSwizzler.mm:
     11        * TestWebKitAPI/CMakeLists.txt:
     12        * TestWebKitAPI/PlatformMac.cmake:
     13        * WebKitTestRunner/PlatformMac.cmake:
     14
    1152019-10-01  John Wilander  <wilander@apple.com>
    216

  • trunk/Tools/DumpRenderTree/PlatformMac.cmake

    r250550 r250591  
    22find_library(CARBON_LIBRARY Carbon)
    33find_library(CORESERVICES_LIBRARY CoreServices)
     4
     5add_definitions(-DJSC_API_AVAILABLE\\\(...\\\)=)
     6add_definitions(-DJSC_CLASS_AVAILABLE\\\(...\\\)=)
    47
    58# FIXME: We shouldn't need to define NS_RETURNS_RETAINED.
    … …  
    3134    ${FORWARDING_HEADERS_DIR}/WebKitLegacy
    3235    ${WEBCORE_DIR}/testing/cocoa
     36    ${WEBKITLEGACY_DIR}
     37    ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa
     38    ${WEBKIT_TESTRUNNER_SHARED_DIR}/spi
    3339)
    3440
    … …  
    5763    mac/AppleScriptController.m
    5864    mac/NavigationController.m
    59     mac/ObjCController.m
    6065    mac/ObjCPlugin.m
    6166    mac/ObjCPluginFunction.m
    … …  
    6873
    6974list(APPEND DumpRenderTree_ObjCpp_SOURCES
     75    DefaultPolicyDelegate.mm
    7076    mac/AccessibilityCommonMac.mm
    7177    mac/AccessibilityControllerMac.mm
    … …  
    8591    mac/MockGeolocationProvider.mm
    8692    mac/MockWebNotificationProvider.mm
     93    mac/ObjCController.m
    8794    mac/PixelDumpSupportMac.mm
    8895    mac/PolicyDelegate.mm
    … …  
    9299    mac/UIScriptControllerMac.mm
    93100    mac/WorkQueueItemMac.mm
     101    ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/ClassMethodSwizzler.mm
     102    ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/LayoutTestSpellChecker.mm
    94103)
    95104

  • trunk/Tools/MiniBrowser/mac/CMakeLists.txt

    r239556 r250591  
    1616
    1717set(MiniBrowser_INCLUDE_DIRECTORIES
     18    ${CMAKE_SOURCE_DIR}/Source/WebKitLegacy
    1819    ${CMAKE_SOURCE_DIR}/Source
    1920    ${FORWARDING_HEADERS_DIR}
    … …  
    2526)
    2627
     28set(CMAKE_EXE_LINKER_FLAGS "-framework Cocoa")
     29
    2730set(EXECUTABLE_NAME MiniBrowser)
    2831set(PRODUCT_NAME MiniBrowser)
    … …  
    3033set(MiniBrowser_Contents_Directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/MiniBrowser.app/Contents)
    3134make_directory(${MiniBrowser_Contents_Directory}/Resources)
    32 add_custom_target(BrowserWindowNib COMMAND ibtool --compile ${MiniBrowser_Contents_Directory}/Resources/BrowserWindow.nib ${MINIBROWSER_DIR}/BrowserWindow.xib VERBATIM)
    33 add_custom_target(ExtensionManagerWindowControllerNib COMMAND ibtool --compile ${MiniBrowser_Contents_Directory}/Resources/ExtensionManagerWindowController.nib ${MINIBROWSER_DIR}/ExtensionManagerWindowController.xib VERBATIM)
    34 add_custom_target(MainMenuNib COMMAND ibtool --compile ${MiniBrowser_Contents_Directory}/Resources/MainMenu.nib ${MINIBROWSER_DIR}/MainMenu.xib VERBATIM)
     35add_custom_command(OUTPUT ${MiniBrowser_Contents_Directory}/Resources/BrowserWindow.nib
     36    COMMAND ibtool --compile ${MiniBrowser_Contents_Directory}/Resources/BrowserWindow.nib ${MINIBROWSER_DIR}/BrowserWindow.xib VERBATIM)
     37add_custom_command(OUTPUT ${MiniBrowser_Contents_Directory}/Resources/ExtensionManagerWindowController.nib
     38    COMMAND ibtool --compile ${MiniBrowser_Contents_Directory}/Resources/ExtensionManagerWindowController.nib ${MINIBROWSER_DIR}/ExtensionManagerWindowController.xib VERBATIM)
     39add_custom_command(OUTPUT ${MiniBrowser_Contents_Directory}/Resources/MainMenu.nib
     40    COMMAND ibtool --compile ${MiniBrowser_Contents_Directory}/Resources/MainMenu.nib ${MINIBROWSER_DIR}/MainMenu.xib VERBATIM)
     41add_custom_target(MiniBrowserNibs ALL DEPENDS
     42    ${MiniBrowser_Contents_Directory}/Resources/BrowserWindow.nib
     43    ${MiniBrowser_Contents_Directory}/Resources/ExtensionManagerWindowController.nib
     44    ${MiniBrowser_Contents_Directory}/Resources/MainMenu.nib
     45)
    3546
    3647include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
    … …  
    3849set_target_properties(MiniBrowser PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MINIBROWSER_DIR}/Info.plist)
    3950target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
    40 add_dependencies(MiniBrowser BrowserWindowNib ExtensionManagerWindowControllerNib MainMenuNib)
     51add_dependencies(MiniBrowser MiniBrowserNibs)

  • trunk/Tools/TestRunnerShared/cocoa/ClassMethodSwizzler.mm

    r238921 r250591  
    2727#import "ClassMethodSwizzler.h"
    2828
     29#include <Foundation/Foundation.h>
     30
    2931ClassMethodSwizzler::ClassMethodSwizzler(Class cls, SEL originalSelector, IMP implementation)
    3032    : m_method(class_getClassMethod(objc_getMetaClass(NSStringFromClass(cls).UTF8String), originalSelector))

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r249810 r250591  
    148148
    149149    set(TestWebCore_LIBRARIES
    150         WebCore
    151150        WebCoreTestSupport
    152151        gtest
    153152    )
     153    if (NOT APPLE)
     154        list(APPEND TestWebCore_LIBRARIES WebCore)
     155    endif ()
    154156
    155157    set(TestWebCore_PRIVATE_INCLUDE_DIRECTORIES
    … …  
    174176
    175177    set(TestWebKitLegacy_LIBRARIES
    176         WebKitLegacy
    177178        gtest
    178179    )
     180    if (NOT APPLE)
     181        list(APPEND TestWebKitLegacy_LIBRARIES
     182            WebKitLegacy
     183        )
     184    endif ()
    179185
    180186    set(TestWebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
    … …  
    285291    endif ()
    286292
    287     add_library(TestWebKitAPIInjectedBundle SHARED
     293    set(TestWebKitAPIInjectedBundle_SOURCES
    288294        InjectedBundleController.cpp
    289295        InjectedBundleMain.cpp
    … …  
    314320        Tests/WebKit/WillSendSubmitEvent_Bundle.cpp
    315321    )
     322    if (APPLE)
     323        list(APPEND TestWebKitAPIInjectedBundle_SOURCES
     324            Tests/WebKit/DOMWindowExtensionBasic_Bundle.cpp
     325
     326            cocoa/UtilitiesCocoa.mm
     327
     328            mac/InjectedBundleControllerMac.mm
     329            mac/PlatformUtilitiesMac.mm
     330        )
     331    endif ()
     332    add_library(TestWebKitAPIInjectedBundle SHARED ${TestWebKitAPIInjectedBundle_SOURCES})
     333
    316334    target_compile_definitions(TestWebKitAPIInjectedBundle PRIVATE BUILDING_TestWebKit)
    317335    target_include_directories(TestWebKitAPIInjectedBundle PRIVATE ${TestWebKit_PRIVATE_INCLUDE_DIRECTORIES})
    318     target_link_libraries(TestWebKitAPIInjectedBundle PRIVATE WebKit)
     336    target_link_libraries(TestWebKitAPIInjectedBundle PRIVATE WebKit WTF)
    319337
    320338    if (COMPILER_IS_GCC_OR_CLANG)

  • trunk/Tools/TestWebKitAPI/PlatformMac.cmake

    r250550 r250591  
     1find_library(CARBON_LIBRARY Carbon)
     2find_library(QUARTZCORE_LIBRARY QuartzCore)
     3
    14set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
     5add_definitions(-DJSC_API_AVAILABLE\\\(...\\\)=)
     6add_definitions(-DJSC_CLASS_AVAILABLE\\\(...\\\)=)
    27
    38include_directories(
    49    "${FORWARDING_HEADERS_DIR}"
     10    "${ICU_INCLUDE_DIRS}"
    511)
    612
    … …  
    2733)
    2834
     35list(APPEND TestWebKitLegacy_LIBRARIES
     36    WTF
     37    WebKit
     38    ${CARBON_LIBRARY}
     39)
     40
     41list(APPEND TestWebCore_LIBRARIES
     42    JavaScriptCore
     43    WTF
     44    WebKit
     45)
     46
    2947set(bundle_harness_SOURCES
    3048    ${TESTWEBKITAPI_DIR}/cocoa/PlatformUtilitiesCocoa.mm
    … …  
    4058    ${test_main_SOURCES}
    4159)
     60set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-framework Cocoa")
     61set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-framework Cocoa")
     62
     63list(APPEND TestWebKit_LIBRARIES
     64    JavaScriptCore
     65    WTF
     66    ${CARBON_LIBRARY}
     67)
     68
     69list(APPEND TestWebCore_LIBRARIES
     70    ${QUARTZCORE_LIBRARY}
     71)
     72
     73list(APPEND TestWebCore_SOURCES
     74    cocoa/UtilitiesCocoa.mm
     75)
     76
     77list(APPEND TestWebKit_SOURCES
     78    cocoa/UtilitiesCocoa.mm
     79
     80    mac/OffscreenWindow.mm
     81    mac/PlatformUtilitiesMac.mm
     82    mac/PlatformWebViewMac.mm
     83)

  • trunk/Tools/WebKitTestRunner/PlatformMac.cmake

    r234685 r250591  
    11find_library(CARBON_LIBRARY Carbon)
     2find_library(FOUNDATION_LIBRARY Foundation)
    23
    34find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
    … …  
    78
    89link_directories(../../WebKitLibraries)
     10add_definitions(-DJSC_API_AVAILABLE\\\(...\\\)=)
     11add_definitions(-DJSC_CLASS_AVAILABLE\\\(...\\\)=)
    912
    1013list(APPEND WebKitTestRunner_LIBRARIES
    … …  
    1316
    1417list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     18    ${CMAKE_BINARY_DIR}
     19    ${CMAKE_SOURCE_DIR}/WebKitLibraries
    1520    ${DERIVED_SOURCES_DIR}
    1621    ${DERIVED_SOURCES_DIR}/WebCore
    … …  
    1823    ${FORWARDING_HEADERS_DIR}/JavaScriptCore
    1924    ${FORWARDING_HEADERS_DIR}/WebCore
     25    ${ICU_INCLUDE_DIRS}
    2026    ${WEBCORE_DIR}/testing/cocoa
     27    ${WEBKITLEGACY_DIR}
    2128    ${WEBKIT_TESTRUNNER_DIR}/cf
    2229    ${WEBKIT_TESTRUNNER_DIR}/cg
    … …  
    2532    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac
    2633    ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac
     34    ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa
    2735    ${WEBKIT_TESTRUNNER_SHARED_DIR}/spi
    28     ${CMAKE_SOURCE_DIR}/WebKitLibraries
    2936)
    3037
    … …  
    4855)
    4956
     57list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES
     58    ${FOUNDATION_LIBRARY}
     59    JavaScriptCore
     60    WTF
     61    WebCoreTestSupport
     62    WebKit
     63)
     64set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-framework Cocoa")
     65
    5066list(APPEND WebKitTestRunner_SOURCES
    5167    ${WEBKIT_TESTRUNNER_DIR}/cg/TestInvocationCG.cpp
    … …  
    5470    ${WEBKIT_TESTRUNNER_DIR}/cocoa/TestControllerCocoa.mm
    5571    ${WEBKIT_TESTRUNNER_DIR}/cocoa/TestRunnerWKWebView.mm
     72    ${WEBKIT_TESTRUNNER_DIR}/cocoa/TestWebsiteDataStoreDelegate.mm
     73    ${WEBKIT_TESTRUNNER_DIR}/cocoa/UIScriptControllerCocoa.mm
    5674
    5775    ${WEBKIT_TESTRUNNER_DIR}/mac/EventSenderProxy.mm
    … …  
    6684    ${WEBKIT_TESTRUNNER_DIR}/mac/main.mm
    6785   
     86    ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/ClassMethodSwizzler.mm
     87
    6888    ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/EventSerializerMac.mm
    6989    ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/SharedEventStreamsMac.mm
Note: See TracChangeset for help on using the changeset viewer.