[CMake][Win] Use target oriented design for WebKitLegacy
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 20 Apr 2019 19:00:15 +0000 (19:00 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 20 Apr 2019 19:00:15 +0000 (19:00 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244488 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
ChangeLog
Source/WebKitLegacy/CMakeLists.txt
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/PlatformMac.cmake
Source/WebKitLegacy/PlatformWin.cmake
Source/WebKitLegacy/win/ChangeLog
Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt
Source/cmake/OptionsWinCairo.cmake
Tools/ChangeLog
Tools/DumpRenderTree/CMakeLists.txt
Tools/DumpRenderTree/PlatformWin.cmake
Tools/DumpRenderTree/win/EventSender.cpp

index 5b4b673..189d95b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2019-04-20  Don Olmstead  <don.olmstead@sony.com>
+
+        [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:
+
 2019-04-18  Ross Kirsling  <ross.kirsling@sony.com>
 
         [WinCairo] Non-unified build fails to link Tools
index 576c28f..b0c77dd 100644 (file)
@@ -17,11 +17,12 @@ set(WebKitLegacy_SOURCES
     WebCoreSupport/WebViewGroup.cpp
 )
 
-set(WebKitLegacy_INCLUDE_DIRECTORIES
+set(WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}"
     "${WEBKITLEGACY_DIR}/Storage"
     "${WEBKITLEGACY_DIR}/WebCoreSupport"
     "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}"
 )
 
 set(WebKitLegacy_SYSTEM_INCLUDE_DIRECTORIES
@@ -58,7 +59,7 @@ if (MSVC)
     add_custom_command(
         TARGET WebKitLegacy
         POST_BUILD
-        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKITLEGACY_DIR} $<TARGET_FILE:WebKitLegacy>
+        COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${WebKitLegacy_DERIVED_SOURCES_DIR} $<TARGET_FILE:WebKitLegacy>
         VERBATIM)
 
      if (NOT WTF_PLATFORM_WIN_CAIRO)
index 1a349f4..e4282d4 100644 (file)
@@ -1,3 +1,17 @@
+2019-04-20  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake][Win] Use target oriented design for WebKitLegacy
+        https://bugs.webkit.org/show_bug.cgi?id=197112
+
+        Reviewed by Konstantin Tokarev.
+
+        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:
+
 2019-04-19  Keith Rollin  <krollin@apple.com>
 
         Add postprocess-header-rule scripts
index 0e4f80f..9c27b3f 100644 (file)
@@ -3,9 +3,7 @@ find_library(QUARTZ_LIBRARY Quartz)
 add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
 add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
 
-list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
-    "${CMAKE_SOURCE_DIR}/WebKitLibraries"
+list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
     "${WEBKITLEGACY_DIR}/mac"
     "${WEBKITLEGACY_DIR}/mac/Carbon"
     "${WEBKITLEGACY_DIR}/mac/DefaultDelegates"
@@ -405,32 +403,32 @@ file(COPY
     mac/Plugins/Hosted/WebKitPluginHost.defs
     mac/Plugins/Hosted/WebKitPluginHostTypes.defs
     mac/Plugins/Hosted/WebKitPluginHostTypes.h
-DESTINATION ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
+DESTINATION ${WebKitLegacy_DERIVED_SOURCES_DIR})
 
 add_custom_command(
     OUTPUT
-        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyServer.c
-        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyUser.c
-        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentServer.c
-        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
-        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostServer.c
-        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
+        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginAgentReplyServer.c
+        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginAgentReplyUser.c
+        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginAgentServer.c
+        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginAgentUser.c
+        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginHostServer.c
+        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginHostUser.c
     DEPENDS mac/Plugins/Hosted/WebKitPluginAgent.defs mac/Plugins/Hosted/WebKitPluginHost.defs
-    WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
+    WORKING_DIRECTORY ${WebKitLegacy_DERIVED_SOURCES_DIR}
     COMMAND mig -I.. WebKitPluginAgent.defs WebKitPluginAgentReply.defs WebKitPluginHost.defs
     VERBATIM)
 add_custom_command(
     OUTPUT
-        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
-        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientUser.c
+        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginClientServer.c
+        ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginClientUser.c
     DEPENDS mac/Plugins/Hosted/WebKitPluginClient.defs
-    WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
+    WORKING_DIRECTORY ${WebKitLegacy_DERIVED_SOURCES_DIR}
     COMMAND mig -I.. -sheader WebKitPluginClientServer.h WebKitPluginClient.defs
     VERBATIM)
 list(APPEND WebKitLegacy_SOURCES
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginAgentUser.c
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginClientServer.c
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginHostUser.c
 )
 
 WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
index 4c5f104..3506b15 100644 (file)
@@ -1,6 +1,6 @@
 if (${WTF_PLATFORM_WIN_CAIRO})
     add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1 -DWEBKIT_EXPORTS=1)
-    list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
+    list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
         ${CAIRO_INCLUDE_DIRS}
         "${WEBKIT_LIBRARIES_DIR}/include"
     )
@@ -36,27 +36,26 @@ endif ()
 list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
 
 add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitVersion.h
+    OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitVersion.h
     MAIN_DEPENDENCY ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl
     DEPENDS ${WEBKITLEGACY_DIR}/mac/Configurations/Version.xcconfig
-    COMMAND ${PERL_EXECUTABLE} ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl --config ${WEBKITLEGACY_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
+    COMMAND ${PERL_EXECUTABLE} ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl --config ${WEBKITLEGACY_DIR}/mac/Configurations/Version.xcconfig --outputDir ${WebKitLegacy_DERIVED_SOURCES_DIR}
     VERBATIM)
-list(APPEND WebKitLegacy_SOURCES ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitVersion.h)
+list(APPEND WebKitLegacy_SOURCES ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitVersion.h)
 
-list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
+list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}/../include/private"
     "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
     "${CMAKE_BINARY_DIR}/../include/private/WebCore"
     "${WEBKITLEGACY_DIR}/win"
     "${WEBKITLEGACY_DIR}/win/plugins"
     "${WEBKITLEGACY_DIR}/win/WebCoreSupport"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/include"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces"
     "${FORWARDING_HEADERS_DIR}/ANGLE"
     "${FORWARDING_HEADERS_DIR}/ANGLE/include"
     "${FORWARDING_HEADERS_DIR}/ANGLE/include/egl"
     "${FORWARDING_HEADERS_DIR}/ANGLE/include/khr"
-    "${DERIVED_SOURCES_DIR}/WebKitLegacy"
 )
 
 list(APPEND WebKitLegacy_INCLUDES
@@ -260,14 +259,14 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(MASM_EXECUTABLE ml64)
         set(MASM_FLAGS /c /Fo)
         add_custom_command(
-            OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj
+            OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/PaintHooks.obj
             MAIN_DEPENDENCY win/plugins/PaintHooks.asm
             COMMAND ${MASM_EXECUTABLE} ${MASM_FLAGS}
-                ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj
+                ${WebKitLegacy_DERIVED_SOURCES_DIR}/PaintHooks.obj
                 ${CMAKE_CURRENT_SOURCE_DIR}/win/plugins/PaintHooks.asm
             VERBATIM)
         list(APPEND WebKitLegacy_SOURCES
-            ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/PaintHooks.obj
+            ${WebKitLegacy_DERIVED_SOURCES_DIR}/PaintHooks.obj
         )
     else ()
         list(APPEND WebKitLegacy_SOURCES
@@ -290,13 +289,13 @@ source_group(WebCoreSupport FILES ${WebKitLegacy_SOURCES_WebCoreSupport})
 macro(GENERATE_INTERFACE _infile _defines _depends)
     get_filename_component(_filewe ${_infile} NAME_WE)
     add_custom_command(
-        OUTPUT  ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}.h
+        OUTPUT  ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/${_filewe}.h
         MAIN_DEPENDENCY ${_infile}
         DEPENDS ${_depends}
-        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}"
+        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}"
         USES_TERMINAL VERBATIM)
-    set_source_files_properties(${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}.h PROPERTIES GENERATED TRUE)
-    set_source_files_properties(${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/${_filewe}_i.c PROPERTIES GENERATED TRUE)
+    set_source_files_properties(${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/${_filewe}.h PROPERTIES GENERATED TRUE)
+    set_source_files_properties(${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/${_filewe}_i.c PROPERTIES GENERATED TRUE)
 endmacro()
 
 set(MIDL_DEFINES /D\ \"__PRODUCTION__=01\")
@@ -393,13 +392,13 @@ set(WEBKITLEGACY_IDL_DEPENDENCIES
     win/Interfaces/Accessible2/AccessibleText.idl
     win/Interfaces/Accessible2/AccessibleText2.idl
     win/Interfaces/Accessible2/IA2CommonTypes.idl
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include/autoversion.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/include/autoversion.h"
 )
 
 add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/include/autoversion.h
+    OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/include/autoversion.h
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${WebKitLegacy_DERIVED_SOURCES_DIR}
     VERBATIM)
 
 GENERATE_INTERFACE(win/Interfaces/WebKit.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
@@ -414,24 +413,24 @@ GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleText.idl ${MIDL_DEFINES}
 GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleText2.idl ${MIDL_DEFINES} "${WEBKITLEGACY_IDL_DEPENDENCIES}")
 
 add_library(WebKitLegacyGUID STATIC
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit.h"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleApplication.h"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2.h"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_2.h"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleRelation.h"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleStates.h"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/IA2CommonTypes.h"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleEditableText.h"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText.h"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText2.h"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit_i.c"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleApplication_i.c"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_i.c"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/Accessible2_2_i.c"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleRelation_i.c"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleEditableText_i.c"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText_i.c"
-    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/AccessibleText2_i.c"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/WebKit.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleApplication.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2_2.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleRelation.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleStates.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/IA2CommonTypes.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleEditableText.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText2.h"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/WebKit_i.c"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleApplication_i.c"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2_i.c"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2_2_i.c"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleRelation_i.c"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleEditableText_i.c"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText_i.c"
+    "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText2_i.c"
 )
 set_target_properties(WebKitLegacyGUID PROPERTIES OUTPUT_NAME WebKitGUID${DEBUG_SUFFIX})
 
@@ -475,21 +474,35 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKE
 # If this directory isn't created before midl runs and attempts to output WebKit.tlb,
 # It fails with an unusual error - midl failed - failed to save all changes
 file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces)
+file(MAKE_DIRECTORY ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces)
 
-set(WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit.h
+set(WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2.h
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/Accessible2_2.h
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleApplication.h
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleEditableText.h
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleRelation.h
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleStates.h
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText.h
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/AccessibleText2.h
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/IA2CommonTypes.h
+    ${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces/WebKit.h
 
+    win/AccessibleBase.h
+    win/AccessibleDocument.h
     win/CFDictionaryPropertyBag.h
+    win/WebDataSource.h
+    win/WebFrame.h
     win/WebKitCOMAPI.h
 )
 
 WEBKIT_MAKE_FORWARDING_HEADERS(WebKitLegacyGUID
     TARGET_NAME WebKitLegacyFrameworkHeaders
     DESTINATION ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}/WebKitLegacy
-    FILES ${WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS}
+    FILES ${WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS}
     FLATTENED
 )
+add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
 
 set(WebKitLegacy_OUTPUT_NAME
     WebKit${DEBUG_SUFFIX}
index 22bb2ce..c1d0683 100644 (file)
@@ -1,3 +1,14 @@
+2019-04-20  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake][Win] Use target oriented design for WebKitLegacy
+        https://bugs.webkit.org/show_bug.cgi?id=197112
+
+        Reviewed by Konstantin Tokarev.
+
+        Fix an include directory.
+
+        * WebKitQuartzCoreAdditions/CMakeLists.txt:
+
 2019-04-18  Jer Noble  <jer.noble@apple.com>
 
         Refactoring: Pull all fullscreen code out of Document and into its own helper class
index ed8fac5..c721b25 100644 (file)
@@ -44,6 +44,7 @@ WEBKIT_ADD_PRECOMPILED_HEADER("WebKitQuartzCoreAdditionsPrefix.h" "WebKitQuartzC
 
 include_directories(
     .
+    "${WTF_FRAMEWORK_HEADERS_DIR}"
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
     "${DERIVED_SOURCES_DIR}/WebKitQuartzCoreAdditions"
     "${CMAKE_BINARY_DIR}/../include/private"
index 5712a70..aaf6a08 100644 (file)
@@ -52,6 +52,7 @@ set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/PrivateHeade
 set(WTF_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WTF/DerivedSources)
 set(JavaScriptCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/DerivedSources)
 set(WebCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebCore/DerivedSources)
+set(WebKitLegacy_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/DerivedSources)
 
 # Override scripts directories
 set(WTF_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/WTF/Scripts)
index 0e4e8cc..df3c3a6 100644 (file)
@@ -1,3 +1,16 @@
+2019-04-20  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake][Win] Use target oriented design for WebKitLegacy
+        https://bugs.webkit.org/show_bug.cgi?id=197112
+
+        Reviewed by Konstantin Tokarev.
+
+        Fix includes and libraries for DumpRenderTree after changes to WebKitLegacy targets.
+
+        * DumpRenderTree/CMakeLists.txt:
+        * DumpRenderTree/PlatformWin.cmake:
+        * DumpRenderTree/win/EventSender.cpp:
+
 2019-04-20  Aakash Jain  <aakash_jain@apple.com>
 
         Update text for old EWS submit button
index 186a95d..bdcebaf 100644 (file)
@@ -27,6 +27,7 @@ set(DumpRenderTree_LIBRARIES
 )
 
 set(DumpRenderTree_INCLUDE_DIRECTORIES
+    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
     ${DERIVED_SOURCES_DIR}/DumpRenderTree
     ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
index 5c5c3f9..e83b401 100644 (file)
@@ -65,8 +65,6 @@ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
     TestNetscapePlugIn/Tests
     TestNetscapePlugIn/win
     TestNetscapePlugIn/Tests/win
-    ${WEBKITLegacy_DIR}/win
-    ${DERIVED_SOURCES_DIR}/WebKitLegacy/Interfaces
 )
 
 list(APPEND DumpRenderTree_LIBRARIES
index 4a3c63b..adcb847 100644 (file)
 #include "DraggingInfo.h"
 #include "DumpRenderTree.h"
 #include "WebCoreTestSupport.h"
-#include "WebFrame.h"
 
 #include <JavaScriptCore/JavaScriptCore.h>
 #include <WebCore/COMPtr.h>
 #include <WebCore/PlatformWheelEvent.h>
+#include <WebKitLegacy/WebFrame.h>
 #include <WebKitLegacy/WebKit.h>
 #include <windows.h>
 #include <wtf/ASCIICType.h>