Changeset 245968 in webkit


Ignore:
Timestamp:
May 31, 2019 9:56:03 AM (5 years ago)
Author:
don.olmstead@sony.com
Message:

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

Reviewed by Konstantin Tokarev.

Source/JavaScriptCore:

Use the WebKit::WTF target.

  • CMakeLists.txt:
  • shell/CMakeLists.txt:

Source/WebCore:

Use the WebKit::WTF target.

  • PlatformWin.cmake:

Source/WebDriver:

Use the WebKit::WTF target.

  • CMakeLists.txt:

Source/WebKitLegacy:

Use the WebKit::WTF target.

  • PlatformWin.cmake:

Source/WebKitLegacy/win:

Use the WebKit::WTF target.

  • WebKitQuartzCoreAdditions/CMakeLists.txt:

Source/WTF:

Create the WebKit::WTF target and use that to propagate headers. Use
WEBKIT_COPY_FILES instead of WEBKIT_MAKE_FORWARDING_HEADERS.

  • wtf/CMakeLists.txt:

Tools:

Use the WebKit::WTF target.

  • DumpRenderTree/CMakeLists.txt:
  • DumpRenderTree/PlatformWin.cmake:
  • MiniBrowser/win/CMakeLists.txt:
  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/PlatformGTK.cmake:
  • TestWebKitAPI/PlatformWPE.cmake:
  • TestWebKitAPI/PlatformWin.cmake:
  • WebKitTestRunner/PlatformGTK.cmake:
  • WebKitTestRunner/PlatformWin.cmake:
Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r245906 r245968  
    88
    99set(JavaScriptCore_INCLUDE_DIRECTORIES
    10     "${WTF_FRAMEWORK_HEADERS_DIR}"
    1110    "${JavaScriptCore_FRAMEWORK_HEADERS_DIR}"
    1211)
    … …  
    117116
    118117set(JavaScriptCore_LIBRARIES
    119     WTF${DEBUG_SUFFIX}
     118    WebKit::WTF
    120119)
    121120
    … …  
    291290)
    292291
    293 target_link_libraries(LLIntSettingsExtractor WTF)
     292target_link_libraries(LLIntSettingsExtractor WebKit::WTF)
    294293add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders)
    295 target_link_libraries(LLIntOffsetsExtractor WTF)
     294target_link_libraries(LLIntOffsetsExtractor WebKit::WTF)
    296295add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders)
    297296

  • trunk/Source/JavaScriptCore/ChangeLog

    r245914 r245968  
     12019-05-31  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WTF target
     4        https://bugs.webkit.org/show_bug.cgi?id=198400
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use the WebKit::WTF target.
     9
     10        * CMakeLists.txt:
     11        * shell/CMakeLists.txt:
     12
    1132019-05-30  Devin Rousso  <drousso@apple.com>
    214

  • trunk/Source/JavaScriptCore/shell/CMakeLists.txt

    r244712 r245968  
    99set(jsc_LIBRARIES
    1010    ${CMAKE_DL_LIBS}
    11     JavaScriptCore${DEBUG_SUFFIX}
    12     WTF${DEBUG_SUFFIX}
     11    JavaScriptCore
    1312)
    1413

  • trunk/Source/WTF/ChangeLog

    r245945 r245968  
     12019-05-31  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WTF target
     4        https://bugs.webkit.org/show_bug.cgi?id=198400
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Create the WebKit::WTF target and use that to propagate headers. Use
     9        WEBKIT_COPY_FILES instead of WEBKIT_MAKE_FORWARDING_HEADERS.
     10
     11        * wtf/CMakeLists.txt:
     12
    1132019-05-30  Saam Barati  <sbarati@apple.com>
    214

  • trunk/Source/WTF/wtf/CMakeLists.txt

    r245723 r245968  
    455455    threads/Signals.cpp
    456456
     457    unicode/CollatorDefault.cpp
    457458    unicode/UTF8Conversion.cpp
     459
     460    unicode/icu/CollatorICU.cpp
    458461)
    459462
    … …  
    486489endif ()
    487490
    488 list(APPEND WTF_SOURCES
    489     unicode/CollatorDefault.cpp
    490 
    491     unicode/icu/CollatorICU.cpp
    492 )
    493 
    494491list(APPEND WTF_LIBRARIES
    495492    ICU::data
    … …  
    498495)
    499496
     497set(WTF_INTERFACE_LIBRARIES WTF)
     498set(WTF_INTERFACE_INCLUDE_DIRECTORIES ${WTF_FRAMEWORK_HEADERS_DIR})
     499set(WTF_INTERFACE_DEPENDENCIES WTF_CopyHeaders)
     500
    500501WEBKIT_FRAMEWORK_DECLARE(WTF)
    501502WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    502503
     504WEBKIT_COPY_FILES(WTF_CopyHeaders
     505    DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
     506    FILES ${WTF_PUBLIC_HEADERS}
     507)
     508
    503509WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
    504510WEBKIT_FRAMEWORK(WTF)
    505 
    506 WEBKIT_MAKE_FORWARDING_HEADERS(WTF
    507     TARGET_NAME WTFFrameworkHeaders
    508     DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
    509     FILES ${WTF_PUBLIC_HEADERS}
    510 )
     511WEBKIT_FRAMEWORK_TARGET(WTF)
    511512
    512513if (MSVC)

  • trunk/Source/WebCore/ChangeLog

    r245966 r245968  
     12019-05-31  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WTF target
     4        https://bugs.webkit.org/show_bug.cgi?id=198400
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use the WebKit::WTF target.
     9
     10        * PlatformWin.cmake:
     11
    1122019-05-31  Joonghun Park  <jh718.park@samsung.com>
    213

  • trunk/Source/WebCore/PlatformWin.cmake

    r245088 r245968  
    237237endif ()
    238238
    239 set(WebCore_OUTPUT_NAME
    240     WebCore${DEBUG_SUFFIX}
    241 )
    242 
    243 list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
    244 list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})
     239set(WebCore_OUTPUT_NAME WebCore${DEBUG_SUFFIX})

  • trunk/Source/WebDriver/CMakeLists.txt

    r245567 r245968  
    77    "${WEBDRIVER_DIR}"
    88    "${DERIVED_SOURCES_WEBDRIVER_DIR}"
    9     "${WTF_FRAMEWORK_HEADERS_DIR}"
    109)
    1110
    … …  
    2019
    2120set(WebDriver_LIBRARIES
    22     WTF
     21    WebKit::WTF
    2322)
    2423

  • trunk/Source/WebDriver/ChangeLog

    r245567 r245968  
     12019-05-31  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WTF target
     4        https://bugs.webkit.org/show_bug.cgi?id=198400
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use the WebKit::WTF target.
     9
     10        * CMakeLists.txt:
     11
    1122019-05-21  Don Olmstead  <don.olmstead@sony.com>
    213

  • trunk/Source/WebKitLegacy/ChangeLog

    r245796 r245968  
     12019-05-31  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WTF target
     4        https://bugs.webkit.org/show_bug.cgi?id=198400
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use the WebKit::WTF target.
     9
     10        * PlatformWin.cmake:
     11
    1122019-05-27  Chris Dumez  <cdumez@apple.com>
    213

  • trunk/Source/WebKitLegacy/PlatformWin.cmake

    r245492 r245968  
    3131    )
    3232endif ()
    33 
    34 list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
    3533
    3634add_custom_command(

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r245950 r245968  
     12019-05-31  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WTF target
     4        https://bugs.webkit.org/show_bug.cgi?id=198400
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use the WebKit::WTF target.
     9
     10        * WebKitQuartzCoreAdditions/CMakeLists.txt:
     11
    1122019-05-30  Simon Fraser  <simon.fraser@apple.com>
    213

  • trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt

    r244488 r245968  
    4545include_directories(
    4646    .
    47     "${WTF_FRAMEWORK_HEADERS_DIR}"
    4847    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    4948    "${DERIVED_SOURCES_DIR}/WebKitQuartzCoreAdditions"
    … …  
    6160target_link_libraries(WebKitQuartzCoreAdditions
    6261    D3d9
    63     WTF${DEBUG_SUFFIX}
     62    WebKit::WTF
    6463    CoreFoundation${DEBUG_SUFFIX}
    6564    CoreGraphics${DEBUG_SUFFIX}

  • trunk/Tools/ChangeLog

    r245965 r245968  
     12019-05-31  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Add WebKit::WTF target
     4        https://bugs.webkit.org/show_bug.cgi?id=198400
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use the WebKit::WTF target.
     9
     10        * DumpRenderTree/CMakeLists.txt:
     11        * DumpRenderTree/PlatformWin.cmake:
     12        * MiniBrowser/win/CMakeLists.txt:
     13        * TestWebKitAPI/CMakeLists.txt:
     14        * TestWebKitAPI/PlatformGTK.cmake:
     15        * TestWebKitAPI/PlatformWPE.cmake:
     16        * TestWebKitAPI/PlatformWin.cmake:
     17        * WebKitTestRunner/PlatformGTK.cmake:
     18        * WebKitTestRunner/PlatformWin.cmake:
     19
    1202019-05-31  Alex Christensen  <achristensen@webkit.org>
    221

  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r244488 r245968  
    6969set(TestNetscapePlugIn_LIBRARIES
    7070    JavaScriptCore
    71     WTF
    7271    WebCoreTestSupport
    7372)

  • trunk/Tools/DumpRenderTree/PlatformWin.cmake

    r244488 r245968  
    6969
    7070list(APPEND DumpRenderTree_LIBRARIES
    71     WTF
    7271    WebKitLegacy
    7372    shlwapi

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

    r244065 r245968  
    11set(MiniBrowser_INCLUDE_DIRECTORIES
    2     ${WTF_FRAMEWORK_HEADERS_DIR}
    32    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
    43    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    … …  
    2928set(MiniBrowser_LIBRARIES
    3029    DbgHelp
    31     WTF
     30    WebKit::WTF
    3231    WebKitLegacy
    3332    WebKitLegacyGUID

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r245214 r245968  
    103103    ${TESTWEBKITAPI_DIR}
    104104    ${THIRDPARTY_DIR}/gtest/include
    105     ${WTF_FRAMEWORK_HEADERS_DIR}
    106105)
    107106
    108107set(TestWTF_LIBRARIES
    109     WTF
     108    WebKit::WTF
    110109    gtest
    111110)
    112 
    113 set(TestWTF_DEPENDENCIES WTFFrameworkHeaders)
    114111
    115112WEBKIT_EXECUTABLE_DECLARE(TestWTF)
    … …  
    157154        ${PAL_FRAMEWORK_HEADERS_DIR}
    158155        ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    159         ${WTF_FRAMEWORK_HEADERS_DIR}
    160156    )
    161157
    … …  
    182178        ${PAL_FRAMEWORK_HEADERS_DIR}
    183179        ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    184         ${WTF_FRAMEWORK_HEADERS_DIR}
    185180        ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
    186181    )
    … …  
    254249        ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
    255250        ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    256         ${WTF_FRAMEWORK_HEADERS_DIR}
    257251        ${WebKit_FRAMEWORK_HEADERS_DIR}
    258252    )

  • trunk/Tools/TestWebKitAPI/PlatformGTK.cmake

    r244907 r245968  
    106106    ${GTK3_INCLUDE_DIRS}
    107107    ${THIRDPARTY_DIR}/gtest/include
    108     ${WTF_FRAMEWORK_HEADERS_DIR}
    109108    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    110109    ${FORWARDING_HEADERS_DIR}

  • trunk/Tools/TestWebKitAPI/PlatformWPE.cmake

    r245565 r245968  
    101101    ${TESTWEBKITAPI_DIR}
    102102    ${THIRDPARTY_DIR}/gtest/include
    103     ${WTF_FRAMEWORK_HEADERS_DIR}
    104103    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    105104    ${FORWARDING_HEADERS_DIR}

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r245492 r245968  
    109109
    110110    list(APPEND TestWebKitLegacy_LIBRARIES
    111         WTF
     111        WebKit::WTF
    112112    )
    113113

  • trunk/Tools/WebKitTestRunner/PlatformGTK.cmake

    r243934 r245968  
    3030    ${GTK3_LIBRARIES}
    3131    ${GLIB_LIBRARIES}
    32     WTF
    3332    WebCore
    3433    WebCorePlatformGTK

  • trunk/Tools/WebKitTestRunner/PlatformWin.cmake

    r243934 r245968  
    3737
    3838list(APPEND WebKitTestRunner_LIBRARIES
    39     WTF
    4039    WebKit
    4140)
    … …  
    4544    WebKit
    4645)
    47 
    4846
    4947list(REMOVE_ITEM
Note: See TracChangeset for help on using the changeset viewer.