Changeset 260277 in webkit


Ignore:
Timestamp:
Apr 17, 2020 1:15:01 PM (4 years ago)
Author:
don.olmstead@sony.com
Message:

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

Reviewed by Michael Catanzaro.

.:

Add a target file for internal Apple Windows builds.

  • Source/cmake/target/WebCore.cmake: Added.

Source/WebCore:

Add a WebKit::WebCore target. Remove the WebCoreHeaderInterface target since
the WebKit::WebCore target is functionaly the same.

  • CMakeLists.txt:

Source/WebKit:

Use the WebKit::WebCore target within the WebKit target.

  • CMakeLists.txt:
  • PlatformGTK.cmake:
  • PlatformWPE.cmake:
  • PlatformWin.cmake:

Source/WebKitLegacy:

Use the WebKit::WebCore target within WebKitLegacy.

  • CMakeLists.txt:
  • PlatformFTW.cmake:
  • PlatformWin.cmake:

Tools:

Use the WebKit::WebCore target within tests and developer tools.

  • DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
  • MiniBrowser/wpe/CMakeLists.txt:
  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/PlatformGTK.cmake:
  • TestWebKitAPI/PlatformWPE.cmake:
  • TestWebKitAPI/PlatformWin.cmake:
  • TestWebKitAPI/glib/CMakeLists.txt:
Location:
trunk
Files:
1 added
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r260175 r260277  
     12020-04-17  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WebCore target
     4        https://bugs.webkit.org/show_bug.cgi?id=210445
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Add a target file for internal Apple Windows builds.
     9
     10        * Source/cmake/target/WebCore.cmake: Added.
     11
    1122020-04-16  Carlos Garcia Campos  <cgarcia@igalia.com>
    213

  • trunk/Source/WebCore/CMakeLists.txt

    r260243 r260277  
    16821682set(PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/PaintWorkletGlobalScopeConstructors.idl)
    16831683
     1684set(WebCore_INTERFACE_LIBRARIES WebCore)
     1685set(WebCore_INTERFACE_INCLUDE_DIRECTORIES ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR})
     1686
    16841687WEBKIT_FRAMEWORK_DECLARE(WebCore)
    16851688WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    1686 
    1687 WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
    1688     TARGET_NAME WebCorePrivateFrameworkHeaders
    1689     DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
    1690     FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
    1691     FLATTENED
    1692 )
    16931689
    16941690# Generate CommandLineAPIModuleSource.h
    … …  
    18651861        --workletGlobalScopeConstructorsFile ${WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE}
    18661862        --paintWorkletGlobalScopeConstructorsFile ${PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE})
     1863list(APPEND WebCore_DEPENDENCIES WebCoreBindings)
    18671864
    18681865GENERATE_BINDINGS(WebCoreTestSupportBindings
    … …  
    20032000endif ()
    20042001
     2002WEBKIT_COPY_FILES(WebCore_CopyPrivateHeaders
     2003    DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
     2004    FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
     2005    FLATTENED
     2006)
     2007list(APPEND WebCore_INTERFACE_DEPENDENCIES WebCore_CopyPrivateHeaders)
     2008
    20052009WEBKIT_FRAMEWORK(WebCore)
    2006 
    2007 add_dependencies(WebCore WebCoreBindings)
    2008 add_dependencies(WebCorePrivateFrameworkHeaders WebCoreBindings)
     2010WEBKIT_FRAMEWORK_TARGET(WebCore)
    20092011
    20102012if (APPLE)
    … …  
    20192021    WEBKIT_ADD_TARGET_CXX_FLAGS(WebCore -fno-tree-sra)
    20202022endif ()
    2021 
    2022 # Include paths of WebCore doesn't propagate to targets using WebKit
    2023 # because WebCore is linked to WebKit as a PRIVATE library. Forwarding
    2024 # headers generated by generate-forwarding-headers.pl needs include
    2025 # paths of WebCore.
    2026 add_library(WebCoreHeaderInterface INTERFACE)
    2027 target_include_directories(WebCoreHeaderInterface INTERFACE ${WebCore_INCLUDE_DIRECTORIES})
    2028 target_include_directories(WebCoreHeaderInterface SYSTEM INTERFACE ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
    2029 target_link_libraries(WebCoreHeaderInterface INTERFACE ${WebCore_LIBRARIES})
    20302023
    20312024if (MSVC)

  • trunk/Source/WebCore/ChangeLog

    r260274 r260277  
     12020-04-17  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WebCore target
     4        https://bugs.webkit.org/show_bug.cgi?id=210445
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Add a WebKit::WebCore target. Remove the WebCoreHeaderInterface target since
     9        the WebKit::WebCore target is functionaly the same.
     10
     11        * CMakeLists.txt:
     12
    1132020-04-17  Ryan Haddad  <ryanhaddad@apple.com>
    214

  • trunk/Source/WebKit/CMakeLists.txt

    r259560 r260277  
    264264)
    265265
    266 if (${WebCore_LIBRARY_TYPE} STREQUAL SHARED)
    267     # All users of WebKit need to link WebCore if WebCore is a shared library.
    268     if (APPLE)
    269         set(WebKit_PRIVATE_LIBRARIES WebCore)
    270     else ()
    271         set(WebKit_LIBRARIES WebCore)
    272     endif ()
    273 else ()
    274     set(WebKit_LIBRARIES WebCoreHeaderInterface)
    275     set(WebKit_PRIVATE_LIBRARIES WebCore)
    276 endif ()
     266# FIXME: https://bugs.webkit.org/show_bug.cgi?id=210366
     267set(WebKit_LIBRARIES WebKit::WebCore)
    277268
    278269set(WebProcess_LIBRARIES
    … …  
    335326endif ()
    336327
     328if (USE_LIBWEBRTC)
     329    list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/"
     330        "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
     331        "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/abseil-cpp")
     332    list(APPEND WebKit_LIBRARIES webrtc)
     333endif ()
     334
    337335if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
    338336    list(APPEND WebKit_PRIVATE_LIBRARIES atomic)

  • trunk/Source/WebKit/ChangeLog

    r260276 r260277  
     12020-04-17  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WebCore target
     4        https://bugs.webkit.org/show_bug.cgi?id=210445
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Use the WebKit::WebCore target within the WebKit target.
     9
     10        * CMakeLists.txt:
     11        * PlatformGTK.cmake:
     12        * PlatformWPE.cmake:
     13        * PlatformWin.cmake:
     14
    1152020-04-17  Simon Fraser  <simon.fraser@apple.com>
    216

  • trunk/Source/WebKit/PlatformGTK.cmake

    r260012 r260277  
    422422list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
    423423    ${ENCHANT_INCLUDE_DIRS}
     424    ${GIO_UNIX_INCLUDE_DIRS}
    424425    ${GLIB_INCLUDE_DIRS}
    425426    ${GSTREAMER_INCLUDE_DIRS}

  • trunk/Source/WebKit/PlatformWPE.cmake

    r259560 r260277  
    277277    ${ATK_INCLUDE_DIRS}
    278278    ${ATK_BRIDGE_INCLUDE_DIRS}
     279    ${GIO_UNIX_INCLUDE_DIRS}
    279280    ${GLIB_INCLUDE_DIRS}
    280281    ${GSTREAMER_INCLUDE_DIRS}

  • trunk/Source/WebKit/PlatformWin.cmake

    r259560 r260277  
    174174
    175175    list(APPEND WebKit_PRIVATE_LIBRARIES
     176        $<TARGET_OBJECTS:WebCore>
    176177        OpenSSL::SSL
    177178        mfuuid.lib

  • trunk/Source/WebKitLegacy/CMakeLists.txt

    r257587 r260277  
    44include(target/TargetJavaScriptCore)
    55include(target/PAL)
     6include(target/WebCore)
    67set_property(DIRECTORY . PROPERTY FOLDER "WebKitLegacy")
    78
    … …  
    2627    "${WEBKITLEGACY_DIR}/Storage"
    2728    "${WEBKITLEGACY_DIR}/WebCoreSupport"
    28     "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
    2929    "${WebKitLegacy_DERIVED_SOURCES_DIR}"
    3030)
    3131
    3232set(WebKitLegacy_PRIVATE_LIBRARIES
    33     WebCore${DEBUG_SUFFIX}
    3433    WebKit::JavaScriptCore
    3534    WebKit::PAL
     35    WebKit::WebCore
    3636)
    3737
    … …  
    4747WEBKIT_FRAMEWORK(WebKitLegacy)
    4848
    49 if (NOT INTERNAL_BUILD)
    50     add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
    51 endif ()
    5249if (TARGET WebKitLegacyGUID)
    5350    add_dependencies(WebKitLegacy WebKitLegacyGUID)

  • trunk/Source/WebKitLegacy/ChangeLog

    r259726 r260277  
     12020-04-17  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WebCore target
     4        https://bugs.webkit.org/show_bug.cgi?id=210445
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Use the WebKit::WebCore target within WebKitLegacy.
     9
     10        * CMakeLists.txt:
     11        * PlatformFTW.cmake:
     12        * PlatformWin.cmake:
     13
    1142020-04-08  Truitt Savell  <tsavell@apple.com>
    215

  • trunk/Source/WebKitLegacy/PlatformFTW.cmake

    r257619 r260277  
    470470    FLATTENED
    471471)
    472 add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
    473472
    474473set(WebKitLegacy_OUTPUT_NAME

  • trunk/Source/WebKitLegacy/PlatformWin.cmake

    r257619 r260277  
    424424
    425425list(APPEND WebKitLegacy_PRIVATE_LIBRARIES
     426    $<TARGET_OBJECTS:WebCore>
    426427    Comctl32
    427428    Comsupp
    … …  
    484485)
    485486if (NOT INTERNAL_BUILD)
    486     add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
     487    add_dependencies(WebKitLegacyFrameworkHeaders WebCore_CopyPrivateHeaders)
    487488endif ()
    488489

  • trunk/Tools/ChangeLog

    r260269 r260277  
     12020-04-17  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WebCore target
     4        https://bugs.webkit.org/show_bug.cgi?id=210445
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Use the WebKit::WebCore target within tests and developer tools.
     9
     10        * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
     11        * MiniBrowser/wpe/CMakeLists.txt:
     12        * TestWebKitAPI/CMakeLists.txt:
     13        * TestWebKitAPI/PlatformGTK.cmake:
     14        * TestWebKitAPI/PlatformWPE.cmake:
     15        * TestWebKitAPI/PlatformWin.cmake:
     16        * TestWebKitAPI/glib/CMakeLists.txt:
     17
    1182020-04-17  Antoine Quint  <graouts@apple.com>
    219

  • trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt

    r247810 r260277  
    6666add_library(TestNetscapePlugIn SHARED ${WebKitTestNetscapePlugIn_SOURCES})
    6767target_link_libraries(TestNetscapePlugIn ${WebKitTestNetscapePlugIn_LIBRARIES})
    68 add_dependencies(TestNetscapePlugIn WebCorePrivateFrameworkHeaders)
     68add_dependencies(TestNetscapePlugIn WebKit::WebCore)
    6969set_target_properties(TestNetscapePlugIn PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
    7070

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

    r259563 r260277  
    1313set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
    1414    ${ATK_INCLUDE_DIRS}
     15    ${GLIB_INCLUDE_DIRS}
     16    ${GSTREAMER_INCLUDE_DIRS}
     17    ${LIBSOUP_INCLUDE_DIRS}
    1518    ${WPEBACKEND_FDO_INCLUDE_DIRS}
    1619)

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r259560 r260277  
    154154
    155155    set(TestWebCore_LIBRARIES
     156        WebKit::WebCore
    156157        gtest
    157158    )
    158     if (NOT APPLE)
    159         list(APPEND TestWebCore_LIBRARIES WebCore WebCoreHeaderInterface)
    160     endif ()
    161159
    162160    set(TestWebCore_PRIVATE_INCLUDE_DIRECTORIES
    … …  
    167165        ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    168166    )
    169 
    170     set(TestWebCore_DEPENDENCIES WebCorePrivateFrameworkHeaders)
    171167
    172168    WEBKIT_EXECUTABLE_DECLARE(TestWebCore)

  • trunk/Tools/TestWebKitAPI/PlatformGTK.cmake

    r259641 r260277  
    4141list(APPEND TestWebCore_SYSTEM_INCLUDE_DIRECTORIES
    4242    ${GLIB_INCLUDE_DIRS}
     43    ${GSTREAMER_INCLUDE_DIRS}
     44    ${LIBSOUP_INCLUDE_DIRS}
    4345)
    4446
    … …  
    6365
    6466list(APPEND TestWebKit_SYSTEM_INCLUDE_DIRECTORIES
     67    ${GIO_UNIX_INCLUDE_DIRS}
    6568    ${GLIB_INCLUDE_DIRS}
    6669)

  • trunk/Tools/TestWebKitAPI/PlatformWPE.cmake

    r257053 r260277  
    88list(APPEND TestWebKit_DEPENDENCIES TestWebKitAPI-forwarding-headers)
    99add_dependencies(TestWebKitAPIInjectedBundle TestWebKitAPI-forwarding-headers)
    10 
    11 include_directories(SYSTEM
    12     ${GLIB_INCLUDE_DIRS}
    13     ${GSTREAMER_INCLUDE_DIRS}
    14     ${GSTREAMER_AUDIO_INCLUDE_DIRS}
    15     ${LIBSOUP_INCLUDE_DIRS}
    16     ${WPEBACKEND_FDO_INCLUDE_DIRS}
    17 )
    1810
    1911set(test_main_SOURCES generic/main.cpp)
    … …  
    4537list(APPEND TestWebCore_SYSTEM_INCLUDE_DIRECTORIES
    4638    ${GLIB_INCLUDE_DIRS}
     39    ${GSTREAMER_INCLUDE_DIRS}
     40    ${LIBSOUP_INCLUDE_DIRS}
    4741)
    4842
    … …  
    6559
    6660list(APPEND TestWebKit_SYSTEM_INCLUDE_DIRECTORIES
     61    ${GIO_UNIX_INCLUDE_DIRS}
    6762    ${GLIB_INCLUDE_DIRS}
    6863)
    … …  
    8883    ${CMAKE_SOURCE_DIR}/Source
    8984    ${FORWARDING_HEADERS_DIR}
     85    ${GLIB_INCLUDE_DIRS}
    9086)
    9187
    … …  
    9389set(TestJSC_SOURCES
    9490    Tests/JavaScriptCore/glib/TestJSC.cpp
     91)
     92
     93set(TestJSC_SYSTEM_INCLUDE_DIRECTORIES
     94    ${GLIB_INCLUDE_DIRS}
    9595)
    9696

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r259560 r260277  
    4242
    4343list(APPEND TestWebCore_LIBRARIES
     44    $<TARGET_OBJECTS:WebCore>
    4445    Crypt32
    4546    D2d1
    4647    Dwrite
    47     dxguid
    4848    Iphlpapi
    4949    Psapi
    … …  
    5151    Usp10
    5252    WindowsCodecs
     53    dxguid
    5354)
    5455

  • trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt

    r255670 r260277  
    1313
    1414set(WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES
     15    ${GIO_UNIX_INCLUDE_DIRS}
    1516    ${GLIB_INCLUDE_DIRS}
    1617    ${GSTREAMER_INCLUDE_DIRS}
Note: See TracChangeset for help on using the changeset viewer.