Changeset 244488 in webkit


Ignore:
Timestamp:
Apr 20, 2019 12:00:15 PM (5 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake][Win] Use target oriented design for WebKitLegacy
​https://bugs.webkit.org/show_bug.cgi?id=197112

Reviewed by Konstantin Tokarev.

.:

Override WebKitLegacy_DERIVED_SOURCES_DIR within WinCairo in support of a target
oriented design.

  • Source/cmake/OptionsWinCairo.cmake:

Source/WebKitLegacy:

Enumerate the public framework headers for WebKitLegacy and copy them. Include
directories should be PRIVATE. Migrate to using WebKitLegacy_DERIVED_SOURCES_DIR.

  • CMakeLists.txt:
  • PlatformMac.cmake:
  • PlatformWin.cmake:

Source/WebKitLegacy/win:

Fix an include directory.

  • WebKitQuartzCoreAdditions/CMakeLists.txt:

Tools:

Fix includes and libraries for DumpRenderTree after changes to WebKitLegacy targets.

  • DumpRenderTree/CMakeLists.txt:
  • DumpRenderTree/PlatformWin.cmake:
  • DumpRenderTree/win/EventSender.cpp:
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r244448 r244488  
     12019-04-20  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][Win] Use target oriented design for WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=197112
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Override WebKitLegacy_DERIVED_SOURCES_DIR within WinCairo in support of a target
     9        oriented design.
     10
     11        * Source/cmake/OptionsWinCairo.cmake:
     12
    1132019-04-18  Ross Kirsling  <ross.kirsling@sony.com>
    214

  • trunk/Source/WebKitLegacy/CMakeLists.txt

    r244443 r244488  
    1818)
    1919
    20 set(WebKitLegacy_INCLUDE_DIRECTORIES
     20set(WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
    2121    "${CMAKE_BINARY_DIR}"
    2222    "${WEBKITLEGACY_DIR}/Storage"
    2323    "${WEBKITLEGACY_DIR}/WebCoreSupport"
    2424    "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
     25    "${WebKitLegacy_DERIVED_SOURCES_DIR}"
    2526)
    2627
    … …  
    5960        TARGET WebKitLegacy
    6061        POST_BUILD
    61         COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKITLEGACY_DIR} $<TARGET_FILE:WebKitLegacy>
     62        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${WebKitLegacy_DERIVED_SOURCES_DIR} $<TARGET_FILE:WebKitLegacy>
    6263        VERBATIM)
    6364

  • trunk/Source/WebKitLegacy/ChangeLog

    r244466 r244488  
     12019-04-20  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][Win] Use target oriented design for WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=197112
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Enumerate the public framework headers for WebKitLegacy and copy them. Include
     9        directories should be PRIVATE. Migrate to using WebKitLegacy_DERIVED_SOURCES_DIR.
     10
     11        * CMakeLists.txt:
     12        * PlatformMac.cmake:
     13        * PlatformWin.cmake:
     14
    1152019-04-19  Keith Rollin  <krollin@apple.com>
    216

  • trunk/Source/WebKitLegacy/PlatformMac.cmake

    r239556 r244488  
    44add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
    55
    6 list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
    7     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
    8     "${CMAKE_SOURCE_DIR}/WebKitLibraries"
     6list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
    97    "${WEBKITLEGACY_DIR}/mac"
    108    "${WEBKITLEGACY_DIR}/mac/Carbon"
    … …  
    406404    mac/Plugins/Hosted/WebKitPluginHostTypes.defs
    407405    mac/Plugins/Hosted/WebKitPluginHostTypes.h
    408 DESTINATION ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
     406DESTINATION ${WebKitLegacy_DERIVED_SOURCES_DIR})
    409407
    410408add_custom_command(
    411409    OUTPUT
    412         ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyServer.c
    413         ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyUser.c
    414         ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentServer.c
    415         ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
    416         ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostServer.c
    417         ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
     410        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginAgentReplyServer.c
     411        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginAgentReplyUser.c
     412        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginAgentServer.c
     413        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginAgentUser.c
     414        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginHostServer.c
     415        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginHostUser.c
    418416    DEPENDS mac/Plugins/Hosted/WebKitPluginAgent.defs mac/Plugins/Hosted/WebKitPluginHost.defs
    419     WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
     417    WORKING_DIRECTORY ${WebKitLegacy_DERIVED_SOURCES_DIR}
    420418    COMMAND mig -I.. WebKitPluginAgent.defs WebKitPluginAgentReply.defs WebKitPluginHost.defs
    421419    VERBATIM)
    422420add_custom_command(
    423421    OUTPUT
    424         ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
    425         ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientUser.c
     422        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginClientServer.c
     423        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginClientUser.c
    426424    DEPENDS mac/Plugins/Hosted/WebKitPluginClient.defs
    427     WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
     425    WORKING_DIRECTORY ${WebKitLegacy_DERIVED_SOURCES_DIR}
    428426    COMMAND mig -I.. -sheader WebKitPluginClientServer.h WebKitPluginClient.defs
    429427    VERBATIM)
    430428list(APPEND WebKitLegacy_SOURCES
    431     ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
    432     ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
    433     ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
     429    ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginAgentUser.c
     430    ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginClientServer.c
     431    ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginHostUser.c
    434432)
    435433

  • trunk/Source/WebKitLegacy/PlatformWin.cmake

    r244443 r244488  
    11if (${WTF_PLATFORM_WIN_CAIRO})
    22    add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1 -DWEBKIT_EXPORTS=1)
    3     list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
     3    list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
    44        ${CAIRO_INCLUDE_DIRS}
    55        "${WEBKIT_LIBRARIES_DIR}/include"
    … …  
    3737
    3838add_custom_command(
    39     OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitVersion.h
     39    OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitVersion.h
    4040    MAIN_DEPENDENCY ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl
    4141    DEPENDS ${WEBKITLEGACY_DIR}/mac/Configurations/Version.xcconfig
    42     COMMAND ${PERL_EXECUTABLE} ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl --config ${WEBKITLEGACY_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
     42    COMMAND ${PERL_EXECUTABLE} ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl --config ${WEBKITLEGACY_DIR}/mac/Configurations/Version.xcconfig --outputDir ${WebKitLegacy_DERIVED_SOURCES_DIR}
    4343    VERBATIM)
    44 list(APPEND WebKitLegacy_SOURCES ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitVersion.h)
    45 
    46 list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
     44list(APPEND WebKitLegacy_SOURCES ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitVersion.h)
     45
     46list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
    4747    "${CMAKE_BINARY_DIR}/../include/private"
    4848    "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
    … …  
    5151    "${WEBKITLEGACY_DIR}/win/plugins"
    5252    "${WEBKITLEGACY_DIR}/win/WebCoreSupport"
    53     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include"
    54     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces"
     53    "${WebKitLegacy_DERIVED_SOURCES_DIR}/include"
     54    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces"
    5555    "${FORWARDING_HEADERS_DIR}/ANGLE"
    5656    "${FORWARDING_HEADERS_DIR}/ANGLE/include"
    5757    "${FORWARDING_HEADERS_DIR}/ANGLE/include/egl"
    5858    "${FORWARDING_HEADERS_DIR}/ANGLE/include/khr"
    59     "${DERIVED_SOURCES_DIR}/WebKitLegacy"
    6059)
    6160
    … …  
    261260        set(MASM_FLAGS /c /Fo)
    262261        add_custom_command(
    263             OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj
     262            OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/PaintHooks.obj
    264263            MAIN_DEPENDENCY win/plugins/PaintHooks.asm
    265264            COMMAND ${MASM_EXECUTABLE} ${MASM_FLAGS}
    266                 ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj
     265                ${WebKitLegacy_DERIVED_SOURCES_DIR}/PaintHooks.obj
    267266                ${CMAKE_CURRENT_SOURCE_DIR}/win/plugins/PaintHooks.asm
    268267            VERBATIM)
    269268        list(APPEND WebKitLegacy_SOURCES
    270             ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj
     269            ${WebKitLegacy_DERIVED_SOURCES_DIR}/PaintHooks.obj
    271270        )
    272271    else ()
    … …  
    291290    get_filename_component(_filewe ${_infile} NAME_WE)
    292291    add_custom_command(
    293         OUTPUT  ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}.h
     292        OUTPUT  ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/${_filewe}.h
    294293        MAIN_DEPENDENCY ${_infile}
    295294        DEPENDS ${_depends}
    296         COMMAND midl.exe /I "${CMAKE_CURRENT_SOURCE_DIR}/win/Interfaces" /I "${CMAKE_CURRENT_SOURCE_DIR}/win/Interfaces/Accessible2" /I "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include" /I "${CMAKE_CURRENT_SOURCE_DIR}/win" /WX /char signed /env win32 /tlb "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_filewe}.tlb" /out "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces" /h "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}.h" /iid "${_filewe}_i.c" ${_defines} "${CMAKE_CURRENT_SOURCE_DIR}/${_infile}"
     295        COMMAND midl.exe /I "${CMAKE_CURRENT_SOURCE_DIR}/win/Interfaces" /I "${CMAKE_CURRENT_SOURCE_DIR}/win/Interfaces/Accessible2" /I "${WebKitLegacy_DERIVED_SOURCES_DIR}/include" /I "${CMAKE_CURRENT_SOURCE_DIR}/win" /WX /char signed /env win32 /tlb "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_filewe}.tlb" /out "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces" /h "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/${_filewe}.h" /iid "${_filewe}_i.c" ${_defines} "${CMAKE_CURRENT_SOURCE_DIR}/${_infile}"
    297296        USES_TERMINAL VERBATIM)
    298     set_source_files_properties(${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}.h PROPERTIES GENERATED TRUE)
    299     set_source_files_properties(${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}_i.c PROPERTIES GENERATED TRUE)
     297    set_source_files_properties(${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/${_filewe}.h PROPERTIES GENERATED TRUE)
     298    set_source_files_properties(${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/${_filewe}_i.c PROPERTIES GENERATED TRUE)
    300299endmacro()
    301300
    … …  
    394393    win/Interfaces/Accessible2/AccessibleText2.idl
    395394    win/Interfaces/Accessible2/IA2CommonTypes.idl
    396     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include/autoversion.h"
     395    "${WebKitLegacy_DERIVED_SOURCES_DIR}/include/autoversion.h"
    397396)
    398397
    399398add_custom_command(
    400     OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include/autoversion.h
     399    OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/include/autoversion.h
    401400    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
    402     COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
     401    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${WebKitLegacy_DERIVED_SOURCES_DIR}
    403402    VERBATIM)
    404403
    … …  
    415414
    416415add_library(WebKitLegacyGUID STATIC
    417     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit.h"
    418     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleApplication.h"
    419     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2.h"
    420     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_2.h"
    421     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleRelation.h"
    422     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleStates.h"
    423     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/IA2CommonTypes.h"
    424     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleEditableText.h"
    425     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText.h"
    426     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText2.h"
    427     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit_i.c"
    428     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleApplication_i.c"
    429     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_i.c"
    430     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_2_i.c"
    431     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleRelation_i.c"
    432     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleEditableText_i.c"
    433     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText_i.c"
    434     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText2_i.c"
     416    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/WebKit.h"
     417    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleApplication.h"
     418    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2.h"
     419    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2_2.h"
     420    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleRelation.h"
     421    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleStates.h"
     422    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/IA2CommonTypes.h"
     423    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleEditableText.h"
     424    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText.h"
     425    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText2.h"
     426    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/WebKit_i.c"
     427    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleApplication_i.c"
     428    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2_i.c"
     429    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2_2_i.c"
     430    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleRelation_i.c"
     431    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleEditableText_i.c"
     432    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText_i.c"
     433    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText2_i.c"
    435434)
    436435set_target_properties(WebKitLegacyGUID PROPERTIES OUTPUT_NAME WebKitGUID${DEBUG_SUFFIX})
    … …  
    476475# It fails with an unusual error - midl failed - failed to save all changes
    477476file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
    478 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces)
    479 
    480 set(WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS
    481     ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit.h
    482 
     477file(MAKE_DIRECTORY ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces)
     478
     479set(WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS
     480    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2.h
     481    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2_2.h
     482    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleApplication.h
     483    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleEditableText.h
     484    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleRelation.h
     485    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleStates.h
     486    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText.h
     487    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText2.h
     488    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/IA2CommonTypes.h
     489    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/WebKit.h
     490
     491    win/AccessibleBase.h
     492    win/AccessibleDocument.h
    483493    win/CFDictionaryPropertyBag.h
     494    win/WebDataSource.h
     495    win/WebFrame.h
    484496    win/WebKitCOMAPI.h
    485497)
    … …  
    488500    TARGET_NAME WebKitLegacyFrameworkHeaders
    489501    DESTINATION ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}/WebKitLegacy
    490     FILES ${WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS}
     502    FILES ${WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS}
    491503    FLATTENED
    492504)
     505add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
    493506
    494507set(WebKitLegacy_OUTPUT_NAME

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r244440 r244488  
     12019-04-20  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][Win] Use target oriented design for WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=197112
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Fix an include directory.
     9
     10        * WebKitQuartzCoreAdditions/CMakeLists.txt:
     11
    1122019-04-18  Jer Noble  <jer.noble@apple.com>
    213

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

    r243934 r244488  
    4545include_directories(
    4646    .
     47    "${WTF_FRAMEWORK_HEADERS_DIR}"
    4748    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    4849    "${DERIVED_SOURCES_DIR}/WebKitQuartzCoreAdditions"

  • trunk/Source/cmake/OptionsWinCairo.cmake

    r244349 r244488  
    5353set(JavaScriptCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/DerivedSources)
    5454set(WebCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebCore/DerivedSources)
     55set(WebKitLegacy_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/DerivedSources)
    5556
    5657# Override scripts directories

  • trunk/Tools/ChangeLog

    r244487 r244488  
     12019-04-20  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake][Win] Use target oriented design for WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=197112
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Fix includes and libraries for DumpRenderTree after changes to WebKitLegacy targets.
     9
     10        * DumpRenderTree/CMakeLists.txt:
     11        * DumpRenderTree/PlatformWin.cmake:
     12        * DumpRenderTree/win/EventSender.cpp:
     13
    1142019-04-20  Aakash Jain  <aakash_jain@apple.com>
    215

  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r244065 r244488  
    2828
    2929set(DumpRenderTree_INCLUDE_DIRECTORIES
     30    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    3031    ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
    3132    ${DERIVED_SOURCES_DIR}/DumpRenderTree

  • trunk/Tools/DumpRenderTree/PlatformWin.cmake

    r243934 r244488  
    6666    TestNetscapePlugIn/win
    6767    TestNetscapePlugIn/Tests/win
    68     ${WEBKITLegacy_DIR}/win
    69     ${DERIVED_SOURCES_DIR}/WebKitLegacy/Interfaces
    7068)
    7169

  • trunk/Tools/DumpRenderTree/win/EventSender.cpp

    r239092 r244488  
    3636#include "DumpRenderTree.h"
    3737#include "WebCoreTestSupport.h"
    38 #include "WebFrame.h"
    3938
    4039#include <JavaScriptCore/JavaScriptCore.h>
    4140#include <WebCore/COMPtr.h>
    4241#include <WebCore/PlatformWheelEvent.h>
     42#include <WebKitLegacy/WebFrame.h>
    4343#include <WebKitLegacy/WebKit.h>
    4444#include <windows.h>
Note: See TracChangeset for help on using the changeset viewer.