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

Changeset 243833 in webkit


Ignore:
Timestamp:
Apr 3, 2019, 4:08:44 PM (7 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake][WTF] Mirror XCode header directories
​https://bugs.webkit.org/show_bug.cgi?id=191662

Reviewed by Konstantin Tokarev.

.:

Add WTF_FRAMEWORK_HEADERS_DIR to place WTF headers into. Add frameworks/WTF.cmake
which creates an interface target which will populate dependencies for consumers.
This file is added here to support AppleWin internal builds which invoke CMake on
each directory.

  • Source/cmake/WebKitFS.cmake:
  • Source/cmake/frameworks/WTF.cmake: Added.

Source/JavaScriptCore:

Use WTFFramework as a dependency and include frameworks/WTF.cmake for AppleWin internal
builds.

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

Source/WebCore:

Use WTFFramework as a dependency and include frameworks/WTF.cmake for AppleWin internal
builds.

  • CMakeLists.txt:
  • PlatformWin.cmake:

Source/WebDriver:

Use WTFFramework as a dependency.

  • CMakeLists.txt:

Source/WebKit:

Use WTFFramework as a dependency and include frameworks/WTF.cmake for AppleWin internal
builds.

  • CMakeLists.txt:

Source/WebKitLegacy:

Use WTFFramework as a dependency and include frameworks/WTF.cmake for AppleWin internal
builds.

  • CMakeLists.txt:
  • PlatformWin.cmake:

Source/WebKitLegacy/win:

  • WebKitQuartzCoreAdditions/CMakeLists.txt:

Source/WTF:

Rename WTF forwarding header target to WTFFramework and update the install location
to WTF_FRAMEWORK_HEADERS_DIR.

  • wtf/CMakeLists.txt:

Tools:

Use WTFFramework as a dependency and include frameworks/WTF.cmake for AppleWin internal
builds.

  • CMakeLists.txt:
  • DumpRenderTree/CMakeLists.txt:
  • DumpRenderTree/PlatformWin.cmake:
  • MiniBrowser/win/CMakeLists.txt:
  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/PlatformWin.cmake:
  • WebKitTestRunner/PlatformGTK.cmake:
  • WebKitTestRunner/PlatformWin.cmake:
Location:
trunk
Files:
2 added
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r243819 r243833  
     12019-04-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WTF] Mirror XCode header directories
     4        https://bugs.webkit.org/show_bug.cgi?id=191662
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Add WTF_FRAMEWORK_HEADERS_DIR to place WTF headers into. Add frameworks/WTF.cmake
     9        which creates an interface target which will populate dependencies for consumers.
     10        This file is added here to support AppleWin internal builds which invoke CMake on
     11        each directory.
     12
     13        * Source/cmake/WebKitFS.cmake:
     14        * Source/cmake/frameworks/WTF.cmake: Added.
     15
    1162019-04-03  Myles C. Maxfield  <mmaxfield@apple.com>
    217

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r243832 r243833  
    11cmake_minimum_required(VERSION 2.8.12)
    22include(WebKitCommon)
     3include(frameworks/WTF)
    34set_property(DIRECTORY . PROPERTY FOLDER "JavaScriptCore")
    45
    … …  
    118119
    119120set(JavaScriptCore_LIBRARIES
    120     WTF${DEBUG_SUFFIX}
     121    WTFFramework
    121122    ${ICU_I18N_LIBRARIES}
    122123)
    … …  
    298299)
    299300
    300 target_link_libraries(LLIntSettingsExtractor WTF)
     301target_link_libraries(LLIntSettingsExtractor WTFFramework)
    301302add_dependencies(LLIntSettingsExtractor JavaScriptCoreForwardingHeaders)
    302 target_link_libraries(LLIntOffsetsExtractor WTF)
     303target_link_libraries(LLIntOffsetsExtractor WTFFramework)
    303304add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
    304305

  • trunk/Source/JavaScriptCore/ChangeLog

    r243832 r243833  
     12019-04-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WTF] Mirror XCode header directories
     4        https://bugs.webkit.org/show_bug.cgi?id=191662
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use WTFFramework as a dependency and include frameworks/WTF.cmake for AppleWin internal
     9        builds.
     10
     11        * CMakeLists.txt:
     12        * shell/CMakeLists.txt:
     13
    1142019-04-03  Yusuke Suzuki  <ysuzuki@apple.com>
    215

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

    r243278 r243833  
    66    ${CMAKE_DL_LIBS}
    77    JavaScriptCore${DEBUG_SUFFIX}
    8     WTF${DEBUG_SUFFIX}
     8    WTFFramework
    99)
    1010

  • trunk/Source/WTF/ChangeLog

    r243795 r243833  
     12019-04-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WTF] Mirror XCode header directories
     4        https://bugs.webkit.org/show_bug.cgi?id=191662
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Rename WTF forwarding header target to WTFFramework and update the install location
     9        to WTF_FRAMEWORK_HEADERS_DIR.
     10
     11        * wtf/CMakeLists.txt:
     12
    1132019-04-03  Joseph Pecoraro  <pecoraro@apple.com>
    214

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

    r243641 r243833  
    503503
    504504WEBKIT_MAKE_FORWARDING_HEADERS(WTF
    505     DESTINATION ${FORWARDING_HEADERS_DIR}/wtf
     505    TARGET_NAME WTFFrameworkHeaders
     506    DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
    506507    FILES ${WTF_PUBLIC_HEADERS}
    507508)

  • trunk/Source/WebCore/CMakeLists.txt

    r243755 r243833  
    33include(WebKitCommon)
    44include(WebCoreMacros.cmake)
     5include(frameworks/WTF)
    56
    67set_property(DIRECTORY . PROPERTY FOLDER "WebCore")

  • trunk/Source/WebCore/ChangeLog

    r243830 r243833  
     12019-04-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WTF] Mirror XCode header directories
     4        https://bugs.webkit.org/show_bug.cgi?id=191662
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use WTFFramework as a dependency and include frameworks/WTF.cmake for AppleWin internal
     9        builds.
     10
     11        * CMakeLists.txt:
     12        * PlatformWin.cmake:
     13
    1142019-04-03  Said Abou-Hallawa  <sabouhallawa@apple.com>
    215

  • trunk/Source/WebCore/PlatformWin.cmake

    r243746 r243833  
    366366)
    367367
    368 list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
     368list(APPEND WebCore_LIBRARIES WTFFramework)
    369369if (TARGET libEGL)
    370370    list(APPEND WebCore_LIBRARIES libEGL)
    371371endif ()
    372 list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})
     372list(APPEND WebCoreTestSupport_LIBRARIES WTFFramework)

  • trunk/Source/WebDriver/CMakeLists.txt

    r240786 r243833  
    1818
    1919set(WebDriver_LIBRARIES
    20     WTF
     20    WTFFramework
    2121)
    2222

  • trunk/Source/WebDriver/ChangeLog

    r242352 r243833  
     12019-04-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WTF] Mirror XCode header directories
     4        https://bugs.webkit.org/show_bug.cgi?id=191662
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use WTFFramework as a dependency.
     9
     10        * CMakeLists.txt:
     11
    1122019-03-04  Karl Leplat  <karl.leplat_ext@softathome.com>
    213

  • trunk/Source/WebKit/CMakeLists.txt

    r243671 r243833  
    11include(WebKitCommon)
     2include(frameworks/WTF)
    23
    34set_property(DIRECTORY . PROPERTY FOLDER "WebKit")

  • trunk/Source/WebKit/ChangeLog

    r243829 r243833  
     12019-04-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WTF] Mirror XCode header directories
     4        https://bugs.webkit.org/show_bug.cgi?id=191662
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use WTFFramework as a dependency and include frameworks/WTF.cmake for AppleWin internal
     9        builds.
     10
     11        * CMakeLists.txt:
     12
    1132019-04-03  Alex Christensen  <achristensen@webkit.org>
    214

  • trunk/Source/WebKitLegacy/CMakeLists.txt

    r240292 r243833  
    11cmake_minimum_required(VERSION 2.8.12)
    22include(WebKitCommon)
     3include(frameworks/WTF)
    34set_property(DIRECTORY . PROPERTY FOLDER "WebKitLegacy")
    45

  • trunk/Source/WebKitLegacy/ChangeLog

    r243746 r243833  
     12019-04-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WTF] Mirror XCode header directories
     4        https://bugs.webkit.org/show_bug.cgi?id=191662
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use WTFFramework as a dependency and include frameworks/WTF.cmake for AppleWin internal
     9        builds.
     10
     11        * CMakeLists.txt:
     12        * PlatformWin.cmake:
     13
    1142019-04-02  Fujii Hironori  <Hironori.Fujii@sony.com>
    215

  • trunk/Source/WebKitLegacy/PlatformWin.cmake

    r243746 r243833  
    3535endif ()
    3636
    37 list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
     37list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTFFramework)
    3838
    3939add_custom_command(

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r243643 r243833  
     12019-04-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WTF] Mirror XCode header directories
     4        https://bugs.webkit.org/show_bug.cgi?id=191662
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        * WebKitQuartzCoreAdditions/CMakeLists.txt:
     9
    1102019-03-29  Cathie Chen  <cathiechen@igalia.com>
    211

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

    r224629 r243833  
    6060target_link_libraries(WebKitQuartzCoreAdditions
    6161    D3d9
    62     WTF${DEBUG_SUFFIX}
     62    WTFFramework
    6363    CoreFoundation${DEBUG_SUFFIX}
    6464    CoreGraphics${DEBUG_SUFFIX}

  • trunk/Source/cmake/WebKitFS.cmake

    r222194 r243833  
    4040set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
    4141
     42set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/FrameworkHeaders/WTF.framework/Headers)
     43
    4244set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
     45
     46file(MAKE_DIRECTORY ${WTF_FRAMEWORK_HEADERS_DIR}/wtf)
    4347
    4448file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})

  • trunk/Tools/CMakeLists.txt

    r235477 r243833  
    11set_property(DIRECTORY . PROPERTY FOLDER "Tools")
     2include(frameworks/WTF)
    23
    34# Individual subdirectories are added in the port's cmake file

  • trunk/Tools/ChangeLog

    r243823 r243833  
     12019-04-03  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][WTF] Mirror XCode header directories
     4        https://bugs.webkit.org/show_bug.cgi?id=191662
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Use WTFFramework as a dependency and include frameworks/WTF.cmake for AppleWin internal
     9        builds.
     10
     11        * CMakeLists.txt:
     12        * DumpRenderTree/CMakeLists.txt:
     13        * DumpRenderTree/PlatformWin.cmake:
     14        * MiniBrowser/win/CMakeLists.txt:
     15        * TestWebKitAPI/CMakeLists.txt:
     16        * TestWebKitAPI/PlatformWin.cmake:
     17        * WebKitTestRunner/PlatformGTK.cmake:
     18        * WebKitTestRunner/PlatformWin.cmake:
     19
    1202019-04-03  Aakash Jain  <aakash_jain@apple.com>
    221

  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r229565 r243833  
    6767set(TestNetscapePlugIn_LIBRARIES
    6868    JavaScriptCore
    69     WTF
     69    WTFFramework
    7070    WebCoreTestSupport
    7171)

  • trunk/Tools/DumpRenderTree/PlatformWin.cmake

    r237619 r243833  
    7171
    7272list(APPEND DumpRenderTree_LIBRARIES
    73     WTF
     73    WTFFramework
    7474    WebKitLegacy
    7575    shlwapi

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

    r234650 r243833  
    2525set(MiniBrowser_LIBRARIES
    2626    DbgHelp
    27     WTF
     27    WTFFramework
    2828    WebKitLegacy
    2929    WebKitLegacyGUID

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r242932 r243833  
    11set(TESTWEBKITAPI_DIR "${TOOLS_DIR}/TestWebKitAPI")
     2
    23set(test_wtf_LIBRARIES
    3     WTF${DEBUG_SUFFIX}
     4    WTFFramework
    45    gtest
    56)
    67
    78set(test_webcore_LIBRARIES
    8     WTF${DEBUG_SUFFIX}
     9    WTFFramework
    910    WebCore${DEBUG_SUFFIX}
    1011    gtest
    … …  
    1213
    1314set(TestWebKitAPI_LIBRARIES
    14     WTF${DEBUG_SUFFIX}
     15    WTFFramework
    1516)
    1617
    … …  
    1819    JavaScriptCoreForwardingHeaders
    1920    JavaScriptCorePrivateForwardingHeaders
    20     WTFForwardingHeaders
    2121)
    2222
    … …  
    2929        JavaScriptCore
    3030        TestWebKitAPIBase
    31         WTF
     31        WTFFramework
    3232        WebKit
    3333        gtest
    … …  
    8989    set(TestWebKitAPIBase_LIBRARIES
    9090        JavaScriptCore
    91         WTF
     91        WTFFramework
    9292        WebKit
    9393        gtest
    … …  
    247247
    248248    target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})
    249     add_dependencies(TestWebKitAPIInjectedBundle WTF ${TestWebKitAPI_DEPENDENCIES})
     249    add_dependencies(TestWebKitAPIInjectedBundle ${TestWebKitAPI_DEPENDENCIES})
    250250
    251251    if (COMPILER_IS_GCC_OR_CLANG)
    … …  
    272272    add_dependencies(TestWTF TestWTFLib)
    273273else ()
    274     add_dependencies(TestWTF WTF ${TestWebKitAPI_DEPENDENCIES})
     274    add_dependencies(TestWTF ${TestWebKitAPI_DEPENDENCIES})
    275275endif ()
    276276

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r242694 r243833  
    148148
    149149set(test_webkitlegacy_LIBRARIES
     150    WTFFramework
    150151    WebCoreTestSupport
    151152    WebKitLegacy${DEBUG_SUFFIX}

  • trunk/Tools/WebKitTestRunner/PlatformGTK.cmake

    r222194 r243833  
    3030    ${GTK3_LIBRARIES}
    3131    ${GLIB_LIBRARIES}
    32     WTF
     32    WTFFramework
    3333    WebCore
    3434    WebCorePlatformGTK

  • trunk/Tools/WebKitTestRunner/PlatformWin.cmake

    r238098 r243833  
    3737
    3838list(APPEND WebKitTestRunner_LIBRARIES
    39     WTF
     39    WTFFramework
    4040    WebKit
    4141)
Note: See TracChangeset for help on using the changeset viewer.