⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 259560 in webkit


Ignore:
Timestamp:
Apr 5, 2020, 8:02:54 PM (6 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake] Add WebKit::WebKit target
​https://bugs.webkit.org/show_bug.cgi?id=210033

Reviewed by Fujii Hironori.

.:

Use SET_AND_EXPOSE_TO_BUILD for the Plugin process since ENABLE(PLUGIN_PROCESS)
is used in the source code.

  • Source/cmake/OptionsGTK.cmake:

Source/WebKit:

Use WEBKIT_EXECUTABLE macros for the Process executables. Rename the output
file names to fit with the macro's expectations.

Add Headers.cmake which lists out all the public headers that are currently
shared by the PlayStation and Windows ports. This is then included on each
platform that is using it. Additionally use WEBKIT_COPY_FILES to create a
target which copies headers.

Finally use WEBKIT_FRAMEWORK_TARGET to create a WebKit target. Its dependent
on the WebKit library itself, the processes being built, and any headers that
are copied. This ensures that everything is built for dependent targets.

  • CMakeLists.txt:
  • Headers.cmake: Copied from Source/WebKit/PlatformPlayStation.cmake.
  • PlatformFTW.cmake:
  • PlatformGTK.cmake:
  • PlatformMac.cmake:
  • PlatformPlayStation.cmake:
  • PlatformWPE.cmake:
  • PlatformWin.cmake:

Tools:

Use the WebKit::WebKit target for MiniBrowser and TestWebKit. This removes
the need to have WebProcess and NetworkProcess as dependencies since they are
attached to the WebKit::WebKit target.

Remove references to WebKitFrameworkHeaders as it is now WebKit_CopyHeaders.
It is also a dependency of WebKit::WebKit so it does not need to be listed
as a dependency.

  • MiniBrowser/win/CMakeLists.txt:
  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/PlatformPlayStation.cmake:
  • TestWebKitAPI/PlatformWin.cmake:
  • WebKitTestRunner/CMakeLists.txt:
Location:
trunk
Files:
16 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r259436 r259560  
     12020-04-05  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WebKit target
     4        https://bugs.webkit.org/show_bug.cgi?id=210033
     5
     6        Reviewed by Fujii Hironori.
     7
     8        Use SET_AND_EXPOSE_TO_BUILD for the Plugin process since ENABLE(PLUGIN_PROCESS)
     9        is used in the source code.
     10
     11        * Source/cmake/OptionsGTK.cmake:
     12
    1132020-04-02  Commit Queue  <commit-queue@webkit.org>
    214

  • trunk/Source/WebKit/CMakeLists.txt

    r258327 r259560  
    361361endmacro()
    362362
    363 set(WebKit_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
    364 )
     363set(WebKit_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS)
     364
     365set(WebKit_INTERFACE_LIBRARIES WebKit)
     366set(WebKit_INTERFACE_INCLUDE_DIRECTORIES
     367    ${WebKit_FRAMEWORK_HEADERS_DIR}
     368    ${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}
     369)
     370set(WebKit_INTERFACE_DEPENDENCIES
     371    NetworkProcess
     372    WebProcess
     373)
     374
     375WEBKIT_EXECUTABLE_DECLARE(WebProcess)
     376WEBKIT_EXECUTABLE_DECLARE(NetworkProcess)
     377
     378if (ENABLE_GPU_PROCESS)
     379    WEBKIT_EXECUTABLE_DECLARE(GPUProcess)
     380    list(APPEND WebKit_INTERFACE_DEPENDENCIES GPUProcess)
     381endif ()
     382
     383if (ENABLE_PLUGIN_PROCESS)
     384    WEBKIT_EXECUTABLE_DECLARE(PluginProcess)
     385    list(APPEND WebKit_INTERFACE_DEPENDENCIES PluginProcess)
     386endif ()
    365387
    366388WEBKIT_FRAMEWORK_DECLARE(WebKit)
    367389WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
     390
     391if (WebKit_PUBLIC_FRAMEWORK_HEADERS)
     392    WEBKIT_COPY_FILES(WebKit_CopyHeaders
     393        DESTINATION ${WebKit_FRAMEWORK_HEADERS_DIR}/WebKit
     394        FILES ${WebKit_PUBLIC_FRAMEWORK_HEADERS}
     395        FLATTENED
     396    )
     397    list(APPEND WebKit_DEPENDENCIES WebKit_CopyHeaders)
     398endif ()
     399
     400if (WebKit_PRIVATE_FRAMEWORK_HEADERS)
     401    WEBKIT_COPY_FILES(WebKit_CopyPrivateHeaders
     402        DESTINATION ${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebKit
     403        FILES ${WebKit_PRIVATE_FRAMEWORK_HEADERS}
     404        FLATTENED
     405    )
     406    list(APPEND WebKit_INTERFACE_DEPENDENCIES WebKit_CopyPrivateHeaders)
     407endif ()
    368408
    369409# Helper macro which wraps the generate-message-receiver.py script
    … …  
    470510)
    471511
    472 
    473512list(APPEND WebKit_SOURCES ${WebKit_DERIVED_SOURCES})
    474513
    475514WEBKIT_COMPUTE_SOURCES(WebKit)
    476 
    477515WEBKIT_FRAMEWORK(WebKit)
    478 add_dependencies(WebKit WebCore ${WEBKIT_EXTRA_DEPENDENCIES})
     516WEBKIT_FRAMEWORK_TARGET(WebKit)
    479517ADD_WEBKIT_PREFIX_HEADER(WebKit)
    480518
    481 add_executable(WebProcess ${WebProcess_SOURCES})
     519list(APPEND WebProcess_PRIVATE_INCLUDE_DIRECTORIES ${WebKit_PRIVATE_INCLUDE_DIRECTORIES})
     520WEBKIT_EXECUTABLE(WebProcess)
    482521ADD_WEBKIT_PREFIX_HEADER(WebProcess)
    483 target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
    484 target_include_directories(WebProcess PRIVATE ${WebProcess_INCLUDE_DIRECTORIES})
    485 
    486 if (WebKit_WebProcess_OUTPUT_NAME)
    487     set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit_WebProcess_OUTPUT_NAME})
    488 endif ()
    489 
    490 add_executable(NetworkProcess ${NetworkProcess_SOURCES})
     522
     523list(APPEND NetworkProcess_PRIVATE_INCLUDE_DIRECTORIES ${WebKit_PRIVATE_INCLUDE_DIRECTORIES})
     524WEBKIT_EXECUTABLE(NetworkProcess)
    491525ADD_WEBKIT_PREFIX_HEADER(NetworkProcess)
    492 target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
    493 target_include_directories(NetworkProcess PRIVATE ${NetworkProcess_INCLUDE_DIRECTORIES})
    494 
    495 if (WebKit_NetworkProcess_OUTPUT_NAME)
    496     set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit_NetworkProcess_OUTPUT_NAME})
    497 endif ()
    498526
    499527if (ENABLE_GPU_PROCESS)
    500     add_executable(GPUProcess ${GPUProcess_SOURCES})
     528    list(APPEND GPUProcess_PRIVATE_INCLUDE_DIRECTORIES ${WebKit_PRIVATE_INCLUDE_DIRECTORIES})
     529    WEBKIT_EXECUTABLE(GPUProcess)
    501530    ADD_WEBKIT_PREFIX_HEADER(GPUProcess)
    502     target_link_libraries(GPUProcess ${GPUProcess_LIBRARIES})
    503     target_include_directories(GPUProcess PRIVATE ${GPUProcess_INCLUDE_DIRECTORIES})
    504 
    505     if (WebKit_GPUProcess_OUTPUT_NAME)
    506         set_target_properties(GPUProcess PROPERTIES OUTPUT_NAME ${WebKit_GPUProcess_OUTPUT_NAME})
    507     endif ()
     531endif ()
     532
     533if (ENABLE_PLUGIN_PROCESS)
     534    list(APPEND PluginProcess_PRIVATE_INCLUDE_DIRECTORIES ${WebKit_PRIVATE_INCLUDE_DIRECTORIES})
     535    WEBKIT_EXECUTABLE(PluginProcess)
     536    ADD_WEBKIT_PREFIX_HEADER(PluginProcess)
    508537endif ()
    509538
    … …  
    515544        WEBKIT_ADD_TARGET_CXX_FLAGS(GPUProcess -Wno-unused-parameter)
    516545    endif ()
    517 endif ()
    518 
    519 # FIXME: Mac should build a plugin process.
    520 if (ENABLE_PLUGIN_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
    521     add_definitions(-DENABLE_PLUGIN_PROCESS=1)
    522     add_executable(PluginProcess ${PluginProcess_SOURCES})
    523     ADD_WEBKIT_PREFIX_HEADER(PluginProcess)
    524     target_link_libraries(PluginProcess ${PluginProcess_LIBRARIES})
    525     target_include_directories(PluginProcess PRIVATE ${PluginProcess_INCLUDE_DIRECTORIES})
    526     install(TARGETS PluginProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
    527 
    528     if (COMPILER_IS_GCC_OR_CLANG)
     546    if (ENABLE_PLUGIN_PROCESS)
    529547        WEBKIT_ADD_TARGET_CXX_FLAGS(PluginProcess -Wno-unused-parameter)
    530     endif ()
    531 
    532     if (WebKit_PluginProcess_OUTPUT_NAME)
    533       set_target_properties(PluginProcess PROPERTIES OUTPUT_NAME ${WebKit_PluginProcess_OUTPUT_NAME})
    534548    endif ()
    535549endif ()

  • trunk/Source/WebKit/ChangeLog

    r259553 r259560  
     12020-04-05  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WebKit target
     4        https://bugs.webkit.org/show_bug.cgi?id=210033
     5
     6        Reviewed by Fujii Hironori.
     7
     8        Use WEBKIT_EXECUTABLE macros for the Process executables. Rename the output
     9        file names to fit with the macro's expectations.
     10
     11        Add Headers.cmake which lists out all the public headers that are currently
     12        shared by the PlayStation and Windows ports. This is then included on each
     13        platform that is using it. Additionally use WEBKIT_COPY_FILES to create a
     14        target which copies headers.
     15
     16        Finally use WEBKIT_FRAMEWORK_TARGET to create a WebKit target. Its dependent
     17        on the WebKit library itself, the processes being built, and any headers that
     18        are copied. This ensures that everything is built for dependent targets.
     19
     20        * CMakeLists.txt:
     21        * Headers.cmake: Copied from Source/WebKit/PlatformPlayStation.cmake.
     22        * PlatformFTW.cmake:
     23        * PlatformGTK.cmake:
     24        * PlatformMac.cmake:
     25        * PlatformPlayStation.cmake:
     26        * PlatformWPE.cmake:
     27        * PlatformWin.cmake:
     28
    1292020-04-05  Zan Dobersek  <zdobersek@igalia.com>
    230

  • trunk/Source/WebKit/Headers.cmake

    r259559 r259560  
    1 set(WebKit_OUTPUT_NAME SceWebKit)
    2 set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess)
    3 set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
    4 set(WebKit_GPUProcess_OUTPUT_NAME WebKitGPUProcess)
    5 set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
    6 
    7 add_definitions(-DBUILDING_WEBKIT)
    8 
    9 set(WebKit_USE_PREFIX_HEADER ON)
    10 
    11 list(APPEND WebProcess_SOURCES
    12     WebProcess/EntryPoint/unix/WebProcessMain.cpp
    13 )
    14 
    15 list(APPEND NetworkProcess_SOURCES
    16     NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
    17 )
    18 
    19 list(APPEND GPUProcess_SOURCES
    20     GPUProcess/EntryPoint/unix/GPUProcessMain.cpp
    21 )
    22 
    23 list(APPEND WebKit_SOURCES
    24     GPUProcess/media/playstation/RemoteMediaPlayerProxyPlayStation.cpp
    25 
    26     GPUProcess/playstation/GPUProcessMainPlayStation.cpp
    27     GPUProcess/playstation/GPUProcessPlayStation.cpp
    28 
    29     NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
    30     NetworkProcess/Classifier/WebResourceLoadStatisticsTelemetry.cpp
    31 
    32     NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
    33 
    34     NetworkProcess/WebStorage/StorageManager.cpp
    35 
    36     NetworkProcess/cache/NetworkCacheDataCurl.cpp
    37     NetworkProcess/cache/NetworkCacheIOChannelCurl.cpp
    38 
    39     NetworkProcess/curl/NetworkDataTaskCurl.cpp
    40     NetworkProcess/curl/NetworkProcessCurl.cpp
    41     NetworkProcess/curl/NetworkProcessMainCurl.cpp
    42     NetworkProcess/curl/NetworkSessionCurl.cpp
    43     NetworkProcess/curl/RemoteNetworkingContextCurl.cpp
    44 
    45     Platform/IPC/unix/AttachmentUnix.cpp
    46     Platform/IPC/unix/ConnectionUnix.cpp
    47 
    48     Platform/classifier/ResourceLoadStatisticsClassifier.cpp
    49 
    50     Platform/unix/LoggingUnix.cpp
    51     Platform/unix/ModuleUnix.cpp
    52     Platform/unix/SharedMemoryUnix.cpp
    53 
    54     Shared/API/c/cairo/WKImageCairo.cpp
    55 
    56     Shared/API/c/curl/WKCertificateInfoCurl.cpp
    57 
    58     Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
    59     Shared/CoordinatedGraphics/SimpleViewportController.cpp
    60 
    61     Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp
    62     Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
    63     Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp
    64 
    65     Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp
    66 
    67     Shared/cairo/ShareableBitmapCairo.cpp
    68 
    69     Shared/curl/WebCoreArgumentCodersCurl.cpp
    70 
    71     Shared/libwpe/NativeWebKeyboardEventLibWPE.cpp
    72     Shared/libwpe/NativeWebMouseEventLibWPE.cpp
    73     Shared/libwpe/NativeWebTouchEventLibWPE.cpp
    74     Shared/libwpe/NativeWebWheelEventLibWPE.cpp
    75     Shared/libwpe/WebEventFactory.cpp
    76 
    77     Shared/unix/AuxiliaryProcessMain.cpp
    78 
    79     UIProcess/BackingStore.cpp
    80     UIProcess/DefaultUndoController.cpp
    81     UIProcess/LegacySessionStateCodingNone.cpp
    82     UIProcess/WebGrammarDetail.cpp
    83     UIProcess/WebMemoryPressureHandler.cpp
    84     UIProcess/WebViewportAttributes.cpp
    85 
    86     UIProcess/API/C/WKViewportAttributes.cpp
    87 
    88     UIProcess/API/C/curl/WKProtectionSpaceCurl.cpp
    89     UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp
    90 
    91     UIProcess/Automation/cairo/WebAutomationSessionCairo.cpp
    92 
    93     UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
    94 
    95     UIProcess/Launcher/playstation/ProcessLauncherPlayStation.cpp
    96 
    97     UIProcess/WebsiteData/curl/WebsiteDataStoreCurl.cpp
    98 
    99     UIProcess/WebsiteData/playstation/WebsiteDataStorePlayStation.cpp
    100 
    101     UIProcess/cairo/BackingStoreCairo.cpp
    102 
    103     UIProcess/libwpe/WebPasteboardProxyLibWPE.cpp
    104 
    105     UIProcess/playstation/WebPageProxyPlayStation.cpp
    106     UIProcess/playstation/WebProcessPoolPlayStation.cpp
    107 
    108     WebProcess/GPU/media/playstation/VideoLayerRemotePlayStation.cpp
    109 
    110     WebProcess/InjectedBundle/playstation/InjectedBundlePlayStation.cpp
    111 
    112     WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.cpp
    113 
    114     WebProcess/WebPage/AcceleratedSurface.cpp
    115 
    116     WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
    117     WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
    118     WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
    119 
    120     WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp
    121 
    122     WebProcess/WebPage/playstation/WebPagePlayStation.cpp
    123 
    124     WebProcess/playstation/WebProcessMainPlayStation.cpp
    125     WebProcess/playstation/WebProcessPlayStation.cpp
    126 )
    127 
    128 list(APPEND WebKit_INCLUDE_DIRECTORIES
    129     "${WEBKIT_DIR}/NetworkProcess/curl"
    130     "${WEBKIT_DIR}/Platform/IPC/unix"
    131     "${WEBKIT_DIR}/Platform/generic"
    132     "${WEBKIT_DIR}/Shared/CoordinatedGraphics"
    133     "${WEBKIT_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
    134     "${WEBKIT_DIR}/Shared/libwpe"
    135     "${WEBKIT_DIR}/UIProcess/API/C/cairo"
    136     "${WEBKIT_DIR}/UIProcess/API/C/curl"
    137     "${WEBKIT_DIR}/UIProcess/API/C/playstation"
    138     "${WEBKIT_DIR}/UIProcess/CoordinatedGraphics"
    139     "${WEBKIT_DIR}/WebProcess/WebCoreSupport/curl"
    140     "${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics"
    141     "${WEBKIT_DIR}/WebProcess/WebPage/libwpe"
    142 )
    143 
    144 # Temporarily list out shared headers here
    1451set(WebKit_PUBLIC_FRAMEWORK_HEADERS
    1462    Shared/API/c/WKArray.h
    … …  
    292148    WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
    293149)
    294 
    295 # PlayStation specific
    296 list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
    297     Shared/API/c/cairo/WKImageCairo.h
    298 
    299     Shared/API/c/curl/WKCertificateInfoCurl.h
    300 
    301     Shared/API/c/playstation/WKBasePlayStation.h
    302 
    303     UIProcess/API/C/curl/WKProtectionSpaceCurl.h
    304     UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.h
    305 
    306     UIProcess/API/C/playstation/WKView.h
    307 )
    308 
    309 # Both PAL and WebCore are built as object libraries. The WebKit:: interface
    310 # targets are used. A limitation of that is the object files are not propagated
    311 # so they are added here.
    312 list(APPEND WebKit_PRIVATE_LIBRARIES
    313     $<TARGET_OBJECTS:PAL>
    314 )
    315 
    316 WEBKIT_MAKE_FORWARDING_HEADERS(WebKit
    317     TARGET_NAME WebKitFrameworkHeaders
    318     DESTINATION ${WebKit_FRAMEWORK_HEADERS_DIR}/WebKit
    319     FILES ${WebKit_PUBLIC_FRAMEWORK_HEADERS}
    320     FLATTENED
    321 )

  • trunk/Source/WebKit/PlatformFTW.cmake

    r258309 r259560  
    11set(WebKit_OUTPUT_NAME WebKit2)
    2 set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess)
    3 set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
    4 set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
    5 set(WebKit_GPUProcess_OUTPUT_NAME WebKitGPUProcess)
     2set(WebProcess_OUTPUT_NAME WebKitWebProcess)
     3set(NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
     4set(PluginProcess_OUTPUT_NAME WebKitPluginProcess)
     5set(GPUProcess_OUTPUT_NAME WebKitGPUProcess)
     6
     7include(Headers.cmake)
    68
    79add_definitions(-DBUILDING_WEBKIT)
    … …  
    142144)
    143145
    144 if (${ENABLE_PLUGIN_PROCESS})
    145     list(APPEND PluginProcess_SOURCES
    146     )
    147 endif ()
    148 
    149146add_definitions(-DUSE_DIRECT2D=1 -DUSE_CURL=1)
    150147
    … …  
    201198WEBKIT_WRAP_SOURCELIST(${WebKit_SOURCES})
    202199
    203 # Temporarily list out shared headers here
    204 set(WebKit_PUBLIC_FRAMEWORK_HEADERS
    205     Shared/API/c/WKArray.h
    206     Shared/API/c/WKBase.h
    207     Shared/API/c/WKCertificateInfo.h
    208     Shared/API/c/WKConnectionRef.h
    209     Shared/API/c/WKContextMenuItem.h
    210     Shared/API/c/WKContextMenuItemTypes.h
    211     Shared/API/c/WKData.h
    212     Shared/API/c/WKDeclarationSpecifiers.h
    213     Shared/API/c/WKDeprecated.h
    214     Shared/API/c/WKDiagnosticLoggingResultType.h
    215     Shared/API/c/WKDictionary.h
    216     Shared/API/c/WKErrorRef.h
    217     Shared/API/c/WKEvent.h
    218     Shared/API/c/WKFindOptions.h
    219     Shared/API/c/WKGeometry.h
    220     Shared/API/c/WKImage.h
    221     Shared/API/c/WKMutableArray.h
    222     Shared/API/c/WKMutableDictionary.h
    223     Shared/API/c/WKNumber.h
    224     Shared/API/c/WKPageLoadTypes.h
    225     Shared/API/c/WKPageLoadTypesPrivate.h
    226     Shared/API/c/WKPageVisibilityTypes.h
    227     Shared/API/c/WKPluginInformation.h
    228     Shared/API/c/WKSecurityOriginRef.h
    229     Shared/API/c/WKSerializedScriptValue.h
    230     Shared/API/c/WKString.h
    231     Shared/API/c/WKStringPrivate.h
    232     Shared/API/c/WKType.h
    233     Shared/API/c/WKURL.h
    234     Shared/API/c/WKURLRequest.h
    235     Shared/API/c/WKURLResponse.h
    236     Shared/API/c/WKUserContentInjectedFrames.h
    237     Shared/API/c/WKUserScriptInjectionTime.h
    238 
    239     UIProcess/API/C/WKAuthenticationChallenge.h
    240     UIProcess/API/C/WKAuthenticationDecisionListener.h
    241     UIProcess/API/C/WKBackForwardListItemRef.h
    242     UIProcess/API/C/WKBackForwardListRef.h
    243     UIProcess/API/C/WKContext.h
    244     UIProcess/API/C/WKContextConfigurationRef.h
    245     UIProcess/API/C/WKContextConnectionClient.h
    246     UIProcess/API/C/WKContextDownloadClient.h
    247     UIProcess/API/C/WKContextHistoryClient.h
    248     UIProcess/API/C/WKContextInjectedBundleClient.h
    249     UIProcess/API/C/WKContextPrivate.h
    250     UIProcess/API/C/WKCookieManager.h
    251     UIProcess/API/C/WKCredential.h
    252     UIProcess/API/C/WKCredentialTypes.h
    253     UIProcess/API/C/WKDownload.h
    254     UIProcess/API/C/WKFormSubmissionListener.h
    255     UIProcess/API/C/WKFrame.h
    256     UIProcess/API/C/WKFrameHandleRef.h
    257     UIProcess/API/C/WKFrameInfoRef.h
    258     UIProcess/API/C/WKFramePolicyListener.h
    259     UIProcess/API/C/WKGeolocationManager.h
    260     UIProcess/API/C/WKGeolocationPermissionRequest.h
    261     UIProcess/API/C/WKGeolocationPosition.h
    262     UIProcess/API/C/WKHTTPCookieStoreRef.h
    263     UIProcess/API/C/WKHitTestResult.h
    264     UIProcess/API/C/WKIconDatabase.h
    265     UIProcess/API/C/WKInspector.h
    266     UIProcess/API/C/WKLayoutMode.h
    267     UIProcess/API/C/WKMessageListener.h
    268     UIProcess/API/C/WKMockDisplay.h
    269     UIProcess/API/C/WKMockMediaDevice.h
    270     UIProcess/API/C/WKNativeEvent.h
    271     UIProcess/API/C/WKNavigationActionRef.h
    272     UIProcess/API/C/WKNavigationDataRef.h
    273     UIProcess/API/C/WKNavigationRef.h
    274     UIProcess/API/C/WKNavigationResponseRef.h
    275     UIProcess/API/C/WKNotification.h
    276     UIProcess/API/C/WKNotificationManager.h
    277     UIProcess/API/C/WKNotificationPermissionRequest.h
    278     UIProcess/API/C/WKNotificationProvider.h
    279     UIProcess/API/C/WKOpenPanelParametersRef.h
    280     UIProcess/API/C/WKOpenPanelResultListener.h
    281     UIProcess/API/C/WKPage.h
    282     UIProcess/API/C/WKPageConfigurationRef.h
    283     UIProcess/API/C/WKPageContextMenuClient.h
    284     UIProcess/API/C/WKPageDiagnosticLoggingClient.h
    285     UIProcess/API/C/WKPageFindClient.h
    286     UIProcess/API/C/WKPageFindMatchesClient.h
    287     UIProcess/API/C/WKPageFormClient.h
    288     UIProcess/API/C/WKPageGroup.h
    289     UIProcess/API/C/WKPageInjectedBundleClient.h
    290     UIProcess/API/C/WKPageLoaderClient.h
    291     UIProcess/API/C/WKPageNavigationClient.h
    292     UIProcess/API/C/WKPagePolicyClient.h
    293     UIProcess/API/C/WKPagePrivate.h
    294     UIProcess/API/C/WKPageRenderingProgressEvents.h
    295     UIProcess/API/C/WKPageStateClient.h
    296     UIProcess/API/C/WKPageUIClient.h
    297     UIProcess/API/C/WKPluginLoadPolicy.h
    298     UIProcess/API/C/WKPreferencesRef.h
    299     UIProcess/API/C/WKPreferencesRefPrivate.h
    300     UIProcess/API/C/WKProcessTerminationReason.h
    301     UIProcess/API/C/WKProtectionSpace.h
    302     UIProcess/API/C/WKProtectionSpaceTypes.h
    303     UIProcess/API/C/WKResourceCacheManager.h
    304     UIProcess/API/C/WKSessionStateRef.h
    305     UIProcess/API/C/WKTestingSupport.h
    306     UIProcess/API/C/WKTextChecker.h
    307     UIProcess/API/C/WKUserContentControllerRef.h
    308     UIProcess/API/C/WKUserContentExtensionStoreRef.h
    309     UIProcess/API/C/WKUserMediaPermissionCheck.h
    310     UIProcess/API/C/WKUserMediaPermissionRequest.h
    311     UIProcess/API/C/WKUserScriptRef.h
    312     UIProcess/API/C/WKViewportAttributes.h
    313     UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h
    314     UIProcess/API/C/WKWebsiteDataStoreRef.h
    315     UIProcess/API/C/WKWebsitePolicies.h
    316     UIProcess/API/C/WKWindowFeaturesRef.h
    317     UIProcess/API/C/WebKit2_C.h
    318 
    319     UIProcess/API/cpp/WKRetainPtr.h
    320 
    321     WebProcess/InjectedBundle/API/c/WKBundle.h
    322     WebProcess/InjectedBundle/API/c/WKBundleAPICast.h
    323     WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h
    324     WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h
    325     WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h
    326     WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h
    327     WebProcess/InjectedBundle/API/c/WKBundleFrame.h
    328     WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h
    329     WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
    330     WebProcess/InjectedBundle/API/c/WKBundleInitialize.h
    331     WebProcess/InjectedBundle/API/c/WKBundleInspector.h
    332     WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h
    333     WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h
    334     WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h
    335     WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h
    336     WebProcess/InjectedBundle/API/c/WKBundlePage.h
    337     WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h
    338     WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h
    339     WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h
    340     WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
    341     WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h
    342     WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h
    343     WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
    344     WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
    345     WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h
    346     WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
    347     WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
    348     WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
    349     WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
    350     WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h
    351     WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
    352 )
    353 
    354200# Windows specific
    355201list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
     202    Shared/API/c/curl/WKCertificateInfoCurl.h
     203
    356204    Shared/API/c/win/WKBaseWin.h
    357 
    358     UIProcess/API/C/win/WKView.h
    359 )
    360 
    361 set(WebKit_FORWARDING_HEADERS_DIRECTORIES
    362     Shared/API/c
    363 
    364     Shared/API/c/cf
    365     Shared/API/c/win
    366 
    367     UIProcess/API/C
    368     UIProcess/API/cpp
    369 
    370     UIProcess/API/C/win
    371 
    372     WebProcess/InjectedBundle/API/c
    373 )
    374 
    375 list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
    376     #Shared/API/c/cairo/WKImageCairo.h
    377 
    378     Shared/API/c/curl/WKCertificateInfoCurl.h
    379205
    380206    UIProcess/API/C/curl/WKProtectionSpaceCurl.h
    381207    UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.h
    382 )
    383 
    384 WEBKIT_MAKE_FORWARDING_HEADERS(WebKit
    385     TARGET_NAME WebKitFrameworkHeaders
    386     DESTINATION ${WebKit_FRAMEWORK_HEADERS_DIR}/WebKit
    387     FILES ${WebKit_PUBLIC_FRAMEWORK_HEADERS}
    388     FLATTENED
     208
     209    UIProcess/API/C/win/WKView.h
    389210)
    390211

  • trunk/Source/WebKit/PlatformGTK.cmake

    r258309 r259560  
    22
    33set(WebKit_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION})
    4 set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess)
    5 set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
    6 set(WebKit_GPUProcess_OUTPUT_NAME WebKitGPUProcess)
    7 set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
     4set(WebProcess_OUTPUT_NAME WebKitWebProcess)
     5set(NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
     6set(GPUProcess_OUTPUT_NAME WebKitGPUProcess)
     7set(PluginProcess_OUTPUT_NAME WebKitPluginProcess)
    88
    99file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR})
    … …  
    836836)
    837837
    838 set(WEBKIT_EXTRA_DEPENDENCIES
     838list(APPEND WebKit_DEPENDENCIES
    839839     WebKit-fake-api-headers
    840840     WebKit-forwarding-headers

  • trunk/Source/WebKit/PlatformMac.cmake

    r258309 r259560  
    144144
    145145# FIXME: These should not have Development in production builds.
    146 set(WebKit_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development)
    147 set(WebKit_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)
     146set(WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development)
     147set(NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)
    148148
    149149set(WebProcess_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR})
    … …  
    533533        "com.apple.WebKit.WebContent"
    534534        ${WEBKIT_DIR}/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-OSX.plist
    535         ${WebKit_WebProcess_OUTPUT_NAME})
     535        ${WebProcess_OUTPUT_NAME})
    536536
    537537    WEBKIT_XPC_SERVICE(NetworkProcess
    538538        "com.apple.WebKit.Networking"
    539539        ${WEBKIT_DIR}/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-OSX.plist
    540         ${WebKit_NetworkProcess_OUTPUT_NAME})
     540        ${NetworkProcess_OUTPUT_NAME})
    541541
    542542    set(WebKit_RESOURCES_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/Resources)

  • trunk/Source/WebKit/PlatformPlayStation.cmake

    r259360 r259560  
    11set(WebKit_OUTPUT_NAME SceWebKit)
    2 set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess)
    3 set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
    4 set(WebKit_GPUProcess_OUTPUT_NAME WebKitGPUProcess)
    5 set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
     2set(WebProcess_OUTPUT_NAME WebKitWebProcess)
     3set(NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
     4set(GPUProcess_OUTPUT_NAME WebKitGPUProcess)
     5set(PluginProcess_OUTPUT_NAME WebKitPluginProcess)
     6
     7include(Headers.cmake)
    68
    79add_definitions(-DBUILDING_WEBKIT)
    … …  
    142144)
    143145
    144 # Temporarily list out shared headers here
    145 set(WebKit_PUBLIC_FRAMEWORK_HEADERS
    146     Shared/API/c/WKArray.h
    147     Shared/API/c/WKBase.h
    148     Shared/API/c/WKCertificateInfo.h
    149     Shared/API/c/WKConnectionRef.h
    150     Shared/API/c/WKContextMenuItem.h
    151     Shared/API/c/WKContextMenuItemTypes.h
    152     Shared/API/c/WKData.h
    153     Shared/API/c/WKDeclarationSpecifiers.h
    154     Shared/API/c/WKDeprecated.h
    155     Shared/API/c/WKDiagnosticLoggingResultType.h
    156     Shared/API/c/WKDictionary.h
    157     Shared/API/c/WKErrorRef.h
    158     Shared/API/c/WKEvent.h
    159     Shared/API/c/WKFindOptions.h
    160     Shared/API/c/WKGeometry.h
    161     Shared/API/c/WKImage.h
    162     Shared/API/c/WKMutableArray.h
    163     Shared/API/c/WKMutableDictionary.h
    164     Shared/API/c/WKNumber.h
    165     Shared/API/c/WKPageLoadTypes.h
    166     Shared/API/c/WKPageLoadTypesPrivate.h
    167     Shared/API/c/WKPageVisibilityTypes.h
    168     Shared/API/c/WKPluginInformation.h
    169     Shared/API/c/WKSecurityOriginRef.h
    170     Shared/API/c/WKSerializedScriptValue.h
    171     Shared/API/c/WKString.h
    172     Shared/API/c/WKStringPrivate.h
    173     Shared/API/c/WKType.h
    174     Shared/API/c/WKURL.h
    175     Shared/API/c/WKURLRequest.h
    176     Shared/API/c/WKURLResponse.h
    177     Shared/API/c/WKUserContentInjectedFrames.h
    178     Shared/API/c/WKUserScriptInjectionTime.h
    179 
    180     UIProcess/API/C/WKAuthenticationChallenge.h
    181     UIProcess/API/C/WKAuthenticationDecisionListener.h
    182     UIProcess/API/C/WKBackForwardListItemRef.h
    183     UIProcess/API/C/WKBackForwardListRef.h
    184     UIProcess/API/C/WKContext.h
    185     UIProcess/API/C/WKContextConfigurationRef.h
    186     UIProcess/API/C/WKContextConnectionClient.h
    187     UIProcess/API/C/WKContextDownloadClient.h
    188     UIProcess/API/C/WKContextHistoryClient.h
    189     UIProcess/API/C/WKContextInjectedBundleClient.h
    190     UIProcess/API/C/WKContextPrivate.h
    191     UIProcess/API/C/WKCookieManager.h
    192     UIProcess/API/C/WKCredential.h
    193     UIProcess/API/C/WKCredentialTypes.h
    194     UIProcess/API/C/WKDownload.h
    195     UIProcess/API/C/WKFormSubmissionListener.h
    196     UIProcess/API/C/WKFrame.h
    197     UIProcess/API/C/WKFrameHandleRef.h
    198     UIProcess/API/C/WKFrameInfoRef.h
    199     UIProcess/API/C/WKFramePolicyListener.h
    200     UIProcess/API/C/WKGeolocationManager.h
    201     UIProcess/API/C/WKGeolocationPermissionRequest.h
    202     UIProcess/API/C/WKGeolocationPosition.h
    203     UIProcess/API/C/WKHTTPCookieStoreRef.h
    204     UIProcess/API/C/WKHitTestResult.h
    205     UIProcess/API/C/WKIconDatabase.h
    206     UIProcess/API/C/WKInspector.h
    207     UIProcess/API/C/WKLayoutMode.h
    208     UIProcess/API/C/WKMessageListener.h
    209     UIProcess/API/C/WKMockDisplay.h
    210     UIProcess/API/C/WKMockMediaDevice.h
    211     UIProcess/API/C/WKNativeEvent.h
    212     UIProcess/API/C/WKNavigationActionRef.h
    213     UIProcess/API/C/WKNavigationDataRef.h
    214     UIProcess/API/C/WKNavigationRef.h
    215     UIProcess/API/C/WKNavigationResponseRef.h
    216     UIProcess/API/C/WKNotification.h
    217     UIProcess/API/C/WKNotificationManager.h
    218     UIProcess/API/C/WKNotificationPermissionRequest.h
    219     UIProcess/API/C/WKNotificationProvider.h
    220     UIProcess/API/C/WKOpenPanelParametersRef.h
    221     UIProcess/API/C/WKOpenPanelResultListener.h
    222     UIProcess/API/C/WKPage.h
    223     UIProcess/API/C/WKPageConfigurationRef.h
    224     UIProcess/API/C/WKPageContextMenuClient.h
    225     UIProcess/API/C/WKPageDiagnosticLoggingClient.h
    226     UIProcess/API/C/WKPageFindClient.h
    227     UIProcess/API/C/WKPageFindMatchesClient.h
    228     UIProcess/API/C/WKPageFormClient.h
    229     UIProcess/API/C/WKPageGroup.h
    230     UIProcess/API/C/WKPageInjectedBundleClient.h
    231     UIProcess/API/C/WKPageLoaderClient.h
    232     UIProcess/API/C/WKPageNavigationClient.h
    233     UIProcess/API/C/WKPagePolicyClient.h
    234     UIProcess/API/C/WKPagePrivate.h
    235     UIProcess/API/C/WKPageRenderingProgressEvents.h
    236     UIProcess/API/C/WKPageStateClient.h
    237     UIProcess/API/C/WKPageUIClient.h
    238     UIProcess/API/C/WKPluginLoadPolicy.h
    239     UIProcess/API/C/WKPreferencesRef.h
    240     UIProcess/API/C/WKPreferencesRefPrivate.h
    241     UIProcess/API/C/WKProcessTerminationReason.h
    242     UIProcess/API/C/WKProtectionSpace.h
    243     UIProcess/API/C/WKProtectionSpaceTypes.h
    244     UIProcess/API/C/WKResourceCacheManager.h
    245     UIProcess/API/C/WKSessionStateRef.h
    246     UIProcess/API/C/WKTestingSupport.h
    247     UIProcess/API/C/WKTextChecker.h
    248     UIProcess/API/C/WKUserContentControllerRef.h
    249     UIProcess/API/C/WKUserContentExtensionStoreRef.h
    250     UIProcess/API/C/WKUserMediaPermissionCheck.h
    251     UIProcess/API/C/WKUserMediaPermissionRequest.h
    252     UIProcess/API/C/WKUserScriptRef.h
    253     UIProcess/API/C/WKViewportAttributes.h
    254     UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h
    255     UIProcess/API/C/WKWebsiteDataStoreRef.h
    256     UIProcess/API/C/WKWebsitePolicies.h
    257     UIProcess/API/C/WKWindowFeaturesRef.h
    258     UIProcess/API/C/WebKit2_C.h
    259 
    260     UIProcess/API/cpp/WKRetainPtr.h
    261 
    262     WebProcess/InjectedBundle/API/c/WKBundle.h
    263     WebProcess/InjectedBundle/API/c/WKBundleAPICast.h
    264     WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h
    265     WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h
    266     WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h
    267     WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h
    268     WebProcess/InjectedBundle/API/c/WKBundleFrame.h
    269     WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h
    270     WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
    271     WebProcess/InjectedBundle/API/c/WKBundleInitialize.h
    272     WebProcess/InjectedBundle/API/c/WKBundleInspector.h
    273     WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h
    274     WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h
    275     WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h
    276     WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h
    277     WebProcess/InjectedBundle/API/c/WKBundlePage.h
    278     WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h
    279     WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h
    280     WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h
    281     WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
    282     WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h
    283     WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h
    284     WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
    285     WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
    286     WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h
    287     WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
    288     WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
    289     WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
    290     WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
    291     WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h
    292     WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
    293 )
    294 
    295146# PlayStation specific
    296147list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
    … …  
    313164    $<TARGET_OBJECTS:PAL>
    314165)
    315 
    316 WEBKIT_MAKE_FORWARDING_HEADERS(WebKit
    317     TARGET_NAME WebKitFrameworkHeaders
    318     DESTINATION ${WebKit_FRAMEWORK_HEADERS_DIR}/WebKit
    319     FILES ${WebKit_PUBLIC_FRAMEWORK_HEADERS}
    320     FLATTENED
    321 )

  • trunk/Source/WebKit/PlatformWPE.cmake

    r258309 r259560  
    33
    44set(WebKit_OUTPUT_NAME WPEWebKit-${WPE_API_VERSION})
    5 set(WebKit_WebProcess_OUTPUT_NAME WPEWebProcess)
    6 set(WebKit_NetworkProcess_OUTPUT_NAME WPENetworkProcess)
    7 set(WebKit_GPUProcess_OUTPUT_NAME WPEGPUProcess)
     5set(WebProcess_OUTPUT_NAME WPEWebProcess)
     6set(NetworkProcess_OUTPUT_NAME WPENetworkProcess)
     7set(GPUProcess_OUTPUT_NAME WPEGPUProcess)
    88
    99file(MAKE_DIRECTORY ${DERIVED_SOURCES_WPE_API_DIR})
    … …  
    6060)
    6161
    62 set(WEBKIT_EXTRA_DEPENDENCIES
     62list(APPEND WebKit_DEPENDENCIES
    6363    webkitwpe-fake-api-headers
    6464    webkitwpe-forwarding-headers

  • trunk/Source/WebKit/PlatformWin.cmake

    r258309 r259560  
    11set(WebKit_OUTPUT_NAME WebKit2)
    2 set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess)
    3 set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
    4 set(WebKit_GPUProcess_OUTPUT_NAME WebKitGPUProcess)
    5 set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
     2set(WebProcess_OUTPUT_NAME WebKitWebProcess)
     3set(NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
     4set(GPUProcess_OUTPUT_NAME WebKitGPUProcess)
     5set(PluginProcess_OUTPUT_NAME WebKitPluginProcess)
     6
     7include(Headers.cmake)
    68
    79add_definitions(-DBUILDING_WEBKIT)
    … …  
    98100list(APPEND WebKit_INCLUDE_DIRECTORIES
    99101    "${WEBKIT_DIR}/Platform/classifier"
     102    "${WEBKIT_DIR}/Platform/generic"
    100103    "${WEBKIT_DIR}/PluginProcess/win"
    101104    "${WEBKIT_DIR}/Shared/API/c/win"
    … …  
    138141)
    139142
    140 if (${ENABLE_PLUGIN_PROCESS})
    141     list(APPEND PluginProcess_SOURCES
    142     )
    143 endif ()
    144 
    145143if (${WTF_PLATFORM_WIN_CAIRO})
    146144    add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1)
    … …  
    197195WEBKIT_WRAP_SOURCELIST(${WebKit_SOURCES})
    198196
    199 # Temporarily list out shared headers here
    200 set(WebKit_PUBLIC_FRAMEWORK_HEADERS
    201     Shared/API/c/WKArray.h
    202     Shared/API/c/WKBase.h
    203     Shared/API/c/WKCertificateInfo.h
    204     Shared/API/c/WKConnectionRef.h
    205     Shared/API/c/WKContextMenuItem.h
    206     Shared/API/c/WKContextMenuItemTypes.h
    207     Shared/API/c/WKData.h
    208     Shared/API/c/WKDeclarationSpecifiers.h
    209     Shared/API/c/WKDeprecated.h
    210     Shared/API/c/WKDiagnosticLoggingResultType.h
    211     Shared/API/c/WKDictionary.h
    212     Shared/API/c/WKErrorRef.h
    213     Shared/API/c/WKEvent.h
    214     Shared/API/c/WKFindOptions.h
    215     Shared/API/c/WKGeometry.h
    216     Shared/API/c/WKImage.h
    217     Shared/API/c/WKMutableArray.h
    218     Shared/API/c/WKMutableDictionary.h
    219     Shared/API/c/WKNumber.h
    220     Shared/API/c/WKPageLoadTypes.h
    221     Shared/API/c/WKPageLoadTypesPrivate.h
    222     Shared/API/c/WKPageVisibilityTypes.h
    223     Shared/API/c/WKPluginInformation.h
    224     Shared/API/c/WKSecurityOriginRef.h
    225     Shared/API/c/WKSerializedScriptValue.h
    226     Shared/API/c/WKString.h
    227     Shared/API/c/WKStringPrivate.h
    228     Shared/API/c/WKType.h
    229     Shared/API/c/WKURL.h
    230     Shared/API/c/WKURLRequest.h
    231     Shared/API/c/WKURLResponse.h
    232     Shared/API/c/WKUserContentInjectedFrames.h
    233     Shared/API/c/WKUserScriptInjectionTime.h
    234 
    235     UIProcess/API/C/WKAuthenticationChallenge.h
    236     UIProcess/API/C/WKAuthenticationDecisionListener.h
    237     UIProcess/API/C/WKBackForwardListItemRef.h
    238     UIProcess/API/C/WKBackForwardListRef.h
    239     UIProcess/API/C/WKContext.h
    240     UIProcess/API/C/WKContextConfigurationRef.h
    241     UIProcess/API/C/WKContextConnectionClient.h
    242     UIProcess/API/C/WKContextDownloadClient.h
    243     UIProcess/API/C/WKContextHistoryClient.h
    244     UIProcess/API/C/WKContextInjectedBundleClient.h
    245     UIProcess/API/C/WKContextPrivate.h
    246     UIProcess/API/C/WKCookieManager.h
    247     UIProcess/API/C/WKCredential.h
    248     UIProcess/API/C/WKCredentialTypes.h
    249     UIProcess/API/C/WKDownload.h
    250     UIProcess/API/C/WKFormSubmissionListener.h
    251     UIProcess/API/C/WKFrame.h
    252     UIProcess/API/C/WKFrameHandleRef.h
    253     UIProcess/API/C/WKFrameInfoRef.h
    254     UIProcess/API/C/WKFramePolicyListener.h
    255     UIProcess/API/C/WKGeolocationManager.h
    256     UIProcess/API/C/WKGeolocationPermissionRequest.h
    257     UIProcess/API/C/WKGeolocationPosition.h
    258     UIProcess/API/C/WKHTTPCookieStoreRef.h
    259     UIProcess/API/C/WKHitTestResult.h
    260     UIProcess/API/C/WKIconDatabase.h
    261     UIProcess/API/C/WKInspector.h
    262     UIProcess/API/C/WKLayoutMode.h
    263     UIProcess/API/C/WKMessageListener.h
    264     UIProcess/API/C/WKMockDisplay.h
    265     UIProcess/API/C/WKMockMediaDevice.h
    266     UIProcess/API/C/WKNativeEvent.h
    267     UIProcess/API/C/WKNavigationActionRef.h
    268     UIProcess/API/C/WKNavigationDataRef.h
    269     UIProcess/API/C/WKNavigationRef.h
    270     UIProcess/API/C/WKNavigationResponseRef.h
    271     UIProcess/API/C/WKNotification.h
    272     UIProcess/API/C/WKNotificationManager.h
    273     UIProcess/API/C/WKNotificationPermissionRequest.h
    274     UIProcess/API/C/WKNotificationProvider.h
    275     UIProcess/API/C/WKOpenPanelParametersRef.h
    276     UIProcess/API/C/WKOpenPanelResultListener.h
    277     UIProcess/API/C/WKPage.h
    278     UIProcess/API/C/WKPageConfigurationRef.h
    279     UIProcess/API/C/WKPageContextMenuClient.h
    280     UIProcess/API/C/WKPageDiagnosticLoggingClient.h
    281     UIProcess/API/C/WKPageFindClient.h
    282     UIProcess/API/C/WKPageFindMatchesClient.h
    283     UIProcess/API/C/WKPageFormClient.h
    284     UIProcess/API/C/WKPageGroup.h
    285     UIProcess/API/C/WKPageInjectedBundleClient.h
    286     UIProcess/API/C/WKPageLoaderClient.h
    287     UIProcess/API/C/WKPageNavigationClient.h
    288     UIProcess/API/C/WKPagePolicyClient.h
    289     UIProcess/API/C/WKPagePrivate.h
    290     UIProcess/API/C/WKPageRenderingProgressEvents.h
    291     UIProcess/API/C/WKPageStateClient.h
    292     UIProcess/API/C/WKPageUIClient.h
    293     UIProcess/API/C/WKPluginLoadPolicy.h
    294     UIProcess/API/C/WKPreferencesRef.h
    295     UIProcess/API/C/WKPreferencesRefPrivate.h
    296     UIProcess/API/C/WKProcessTerminationReason.h
    297     UIProcess/API/C/WKProtectionSpace.h
    298     UIProcess/API/C/WKProtectionSpaceTypes.h
    299     UIProcess/API/C/WKResourceCacheManager.h
    300     UIProcess/API/C/WKSessionStateRef.h
    301     UIProcess/API/C/WKTestingSupport.h
    302     UIProcess/API/C/WKTextChecker.h
    303     UIProcess/API/C/WKUserContentControllerRef.h
    304     UIProcess/API/C/WKUserContentExtensionStoreRef.h
    305     UIProcess/API/C/WKUserMediaPermissionCheck.h
    306     UIProcess/API/C/WKUserMediaPermissionRequest.h
    307     UIProcess/API/C/WKUserScriptRef.h
    308     UIProcess/API/C/WKViewportAttributes.h
    309     UIProcess/API/C/WKWebsiteDataStoreConfigurationRef.h
    310     UIProcess/API/C/WKWebsiteDataStoreRef.h
    311     UIProcess/API/C/WKWebsitePolicies.h
    312     UIProcess/API/C/WKWindowFeaturesRef.h
    313     UIProcess/API/C/WebKit2_C.h
    314 
    315     UIProcess/API/cpp/WKRetainPtr.h
    316 
    317     WebProcess/InjectedBundle/API/c/WKBundle.h
    318     WebProcess/InjectedBundle/API/c/WKBundleAPICast.h
    319     WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h
    320     WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h
    321     WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h
    322     WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h
    323     WebProcess/InjectedBundle/API/c/WKBundleFrame.h
    324     WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h
    325     WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
    326     WebProcess/InjectedBundle/API/c/WKBundleInitialize.h
    327     WebProcess/InjectedBundle/API/c/WKBundleInspector.h
    328     WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h
    329     WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h
    330     WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h
    331     WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h
    332     WebProcess/InjectedBundle/API/c/WKBundlePage.h
    333     WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h
    334     WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h
    335     WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h
    336     WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
    337     WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h
    338     WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h
    339     WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
    340     WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
    341     WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h
    342     WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
    343     WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
    344     WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
    345     WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
    346     WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h
    347     WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
    348 )
    349 
    350197# Windows specific
    351198list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
    … …  
    355202)
    356203
    357 set(WebKit_FORWARDING_HEADERS_DIRECTORIES
    358     Shared/API/c
    359 
    360     Shared/API/c/cairo
    361     Shared/API/c/cf
    362     Shared/API/c/win
    363 
    364     UIProcess/API/C
    365     UIProcess/API/cpp
    366 
    367     UIProcess/API/C/win
    368 
    369     WebProcess/InjectedBundle/API/c
    370 )
    371 
    372204if (${WTF_PLATFORM_WIN_CAIRO})
    373205    list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
    … …  
    381213endif ()
    382214
    383 WEBKIT_MAKE_FORWARDING_HEADERS(WebKit
    384     TARGET_NAME WebKitFrameworkHeaders
    385     DESTINATION ${WebKit_FRAMEWORK_HEADERS_DIR}/WebKit
    386     FILES ${WebKit_PUBLIC_FRAMEWORK_HEADERS}
    387     FLATTENED
    388 )
    389 
    390215list(APPEND WebKit_PRIVATE_DEFINITIONS
    391216    STATICALLY_LINKED_WITH_PAL

  • trunk/Source/cmake/OptionsGTK.cmake

    r258877 r259560  
    198198endif ()
    199199
    200 set(ENABLE_PLUGIN_PROCESS ${ENABLE_NETSCAPE_PLUGIN_API})
     200SET_AND_EXPOSE_TO_BUILD(ENABLE_PLUGIN_PROCESS ${ENABLE_NETSCAPE_PLUGIN_API})
    201201
    202202add_definitions(-DBUILDING_GTK__=1)

  • trunk/Tools/ChangeLog

    r259551 r259560  
     12020-04-05  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WebKit target
     4        https://bugs.webkit.org/show_bug.cgi?id=210033
     5
     6        Reviewed by Fujii Hironori.
     7
     8        Use the WebKit::WebKit target for MiniBrowser and TestWebKit. This removes
     9        the need to have WebProcess and NetworkProcess as dependencies since they are
     10        attached to the WebKit::WebKit target.
     11
     12        Remove references to WebKitFrameworkHeaders as it is now WebKit_CopyHeaders.
     13        It is also a dependency of WebKit::WebKit so it does not need to be listed
     14        as a dependency.
     15
     16        * MiniBrowser/win/CMakeLists.txt:
     17        * TestWebKitAPI/CMakeLists.txt:
     18        * TestWebKitAPI/PlatformPlayStation.cmake:
     19        * TestWebKitAPI/PlatformWin.cmake:
     20        * WebKitTestRunner/CMakeLists.txt:
     21
    1222020-04-05  Daniel Bates  <dabates@apple.com>
    223

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

    r257679 r259560  
    5757    )
    5858    list(APPEND MiniBrowser_LIBRARIES
    59         WebKit
     59        WebKit::WebKit
    6060    )
    6161endif ()

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r257295 r259560  
    269269    set(TestWebKit_LIBRARIES
    270270        TestWebKitAPIBase
    271         WebKit
     271        WebKit::WebKit
    272272        gtest
    273273    )
    274274
    275275    set(TestWebKit_DEPENDENCIES
    276         NetworkProcess
    277276        TestWebKitAPIInjectedBundle
    278         WebProcess
    279277    )
    280278
    … …  
    287285    target_compile_definitions(TestWebKitAPIBase PRIVATE BUILDING_TestWebKit)
    288286    target_include_directories(TestWebKitAPIBase PRIVATE ${TestWebKit_PRIVATE_INCLUDE_DIRECTORIES})
    289     target_link_libraries(TestWebKitAPIBase PRIVATE WebKit gtest)
     287    target_link_libraries(TestWebKitAPIBase PRIVATE WebKit::WebKit gtest)
    290288
    291289    if (COMPILER_IS_GCC_OR_CLANG)
    … …  
    339337    target_compile_definitions(TestWebKitAPIInjectedBundle PRIVATE BUILDING_TestWebKit)
    340338    target_include_directories(TestWebKitAPIInjectedBundle PRIVATE ${TestWebKit_PRIVATE_INCLUDE_DIRECTORIES})
    341     target_link_libraries(TestWebKitAPIInjectedBundle PRIVATE WebKit WTF)
     339    target_link_libraries(TestWebKitAPIInjectedBundle PRIVATE WebKit::WebKit WTF)
    342340
    343341    if (COMPILER_IS_GCC_OR_CLANG)

  • trunk/Tools/TestWebKitAPI/PlatformPlayStation.cmake

    r259358 r259560  
    3232# TestWebKit
    3333if (ENABLE_WEBKIT)
    34     add_dependencies(TestWebKitAPIBase WebKitFrameworkHeaders)
    35     add_dependencies(TestWebKitAPIInjectedBundle WebKitFrameworkHeaders)
    36 
    3734    target_sources(TestWebKitAPIInjectedBundle PRIVATE
    3835        generic/UtilitiesGeneric.cpp
    … …  
    5148        playstation/PlatformWebViewPlayStation.cpp
    5249    )
    53 
    54     list(APPEND TestWebKit_DEPENDENCIES
    55         WebKitFrameworkHeaders
    56     )
    5750endif ()

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r256731 r259560  
    125125# TestWebKit
    126126if (ENABLE_WEBKIT)
    127     add_dependencies(TestWebKitAPIBase WebKitFrameworkHeaders)
    128     add_dependencies(TestWebKitAPIInjectedBundle WebKitFrameworkHeaders)
    129 
    130127    target_sources(TestWebKitAPIInjectedBundle PRIVATE
    131128        win/PlatformUtilitiesWin.cpp
    … …  
    149146    list(APPEND TestWebKit_DEFINITIONS ${webcore_DEFINITIONS})
    150147
    151     list(APPEND TestWebKit_DEPENDENCIES
    152         WebKitFrameworkHeaders
    153     )
    154 
    155148    WEBKIT_WRAP_EXECUTABLE(TestWebKit
    156149        SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp

  • trunk/Tools/WebKitTestRunner/CMakeLists.txt

    r246039 r259560  
    2424
    2525set(WebKitTestRunner_LIBRARIES
     26    WebCoreTestSupport
    2627    WebKit::JavaScriptCore
    27     WebCoreTestSupport
    28     WebKit
     28    WebKit::WebKit
    2929)
    3030
Note: See TracChangeset for help on using the changeset viewer.