Changeset 259617 in webkit
- Timestamp:
- Apr 6, 2020 5:58:30 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r259606 r259617 1 2020-04-06 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] Use WEBKIT_EXECUTABLE in DumpRenderTree 4 https://bugs.webkit.org/show_bug.cgi?id=210059 5 6 Reviewed by Fujii Hironori. 7 8 Add a DumpRenderTree derived sources directory. 9 10 * Source/cmake/WebKitFS.cmake: 11 1 12 2020-04-06 Ross Kirsling <ross.kirsling@sony.com> 2 13 -
trunk/Source/cmake/WebKitFS.cmake
r259563 r259617 49 49 set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI") 50 50 set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser") 51 set(DumpRenderTree_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/DumpRenderTree") 51 52 52 53 set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders) -
trunk/Tools/ChangeLog
r259616 r259617 1 2020-04-06 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] Use WEBKIT_EXECUTABLE in DumpRenderTree 4 https://bugs.webkit.org/show_bug.cgi?id=210059 5 6 Reviewed by Fujii Hironori. 7 8 Modify CMake code to use WEBKIT_EXECUTABLE when creating DumpRenderTree. 9 10 * DumpRenderTree/CMakeLists.txt: 11 * DumpRenderTree/PlatformWin.cmake: 12 1 13 2020-04-06 Jonathan Bedard <jbedard@apple.com> 2 14 -
trunk/Tools/DumpRenderTree/CMakeLists.txt
r246039 r259617 1 set(WEBKIT_TESTRUNNER_SHARED_DIR "${TOOLS_DIR}/TestRunnerShared/") 2 set(WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR "${TOOLS_DIR}/TestRunnerShared/UIScriptContext") 3 set(DUMP_RENDER_TREE_BINDINGS_DIR "${TOOLS_DIR}/DumpRenderTree/Bindings") 1 set(DumpRenderTree_DIR "${TOOLS_DIR}/DumpRenderTree") 2 set(DumpRenderTree_BINDINGS_DIR "${TOOLS_DIR}/DumpRenderTree/Bindings") 3 set(WebKitTestRunner_SHARED_DIR "${TOOLS_DIR}/TestRunnerShared/") 4 set(WebKitTestRunner_UISCRIPTCONTEXT_DIR "${TOOLS_DIR}/TestRunnerShared/UIScriptContext") 4 5 5 file(MAKE_DIRECTORY ${D ERIVED_SOURCES_DIR}/DumpRenderTree)6 file(MAKE_DIRECTORY ${DumpRenderTree_DERIVED_SOURCES_DIR}) 6 7 7 8 set(DumpRenderTree_SOURCES 9 ${WebKitTestRunner_SHARED_DIR}/Bindings/JSWrapper.cpp 10 11 ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/UIScriptContext.cpp 12 ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/UIScriptController.cpp 13 8 14 AccessibilityController.cpp 9 15 AccessibilityTextMarker.cpp … … 17 23 TestRunner.cpp 18 24 WorkQueue.cpp 19 ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/UIScriptContext.cpp20 ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/UIScriptController.cpp21 ${WEBKIT_TESTRUNNER_SHARED_DIR}/Bindings/JSWrapper.cpp22 25 ) 23 26 … … 27 30 ) 28 31 29 set(DumpRenderTree_INCLUDE_DIRECTORIES 32 set(DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES 33 ${CMAKE_BINARY_DIR} 34 ${DumpRenderTree_DERIVED_SOURCES_DIR} 35 ${DumpRenderTree_DIR} 36 ${WebKitTestRunner_SHARED_DIR}/Bindings 37 ${WebKitTestRunner_UISCRIPTCONTEXT_DIR} 38 ) 39 40 list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES 41 ${WEBCORE_DIR}/testing/js 42 ) 43 44 list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES 45 ${PAL_FRAMEWORK_HEADERS_DIR} 30 46 ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR} 31 47 ${WebKitLegacy_FRAMEWORK_HEADERS_DIR} 32 ${DERIVED_SOURCES_DIR}/DumpRenderTree33 ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}34 ${WEBKIT_TESTRUNNER_SHARED_DIR}/Bindings35 ${TOOLS_DIR}/DumpRenderTree36 ${CMAKE_SOURCE_DIR}/Source37 ${WEBCORE_DIR}/testing/js38 48 ) 39 49 … … 67 77 ) 68 78 79 set(TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES 80 ${CMAKE_BINARY_DIR} 81 ${DumpRenderTree_DIR}/TestNetscapePlugIn 82 ${DumpRenderTree_DIR}/TestNetscapePlugIn/ForwardingHeaders 83 ${DumpRenderTree_DIR}/TestNetscapePlugIn/Tests 84 ) 85 86 list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES 87 ${PAL_FRAMEWORK_HEADERS_DIR} 88 ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR} 89 ${WebKitLegacy_FRAMEWORK_HEADERS_DIR} 90 ) 91 69 92 set(TestNetscapePlugIn_LIBRARIES 93 WebCoreTestSupport 70 94 WebKit::JavaScriptCore 71 WebCoreTestSupport72 95 ) 73 96 74 97 set(DumpRenderTree_IDL_FILES 75 "${W EBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"98 "${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl" 76 99 ) 77 100 … … 79 102 OUTPUT_SOURCE DumpRenderTree_SOURCES 80 103 INPUT_FILES ${DumpRenderTree_IDL_FILES} 81 BASE_DIR ${D UMP_RENDER_TREE_BINDINGS_DIR}104 BASE_DIR ${DumpRenderTree_BINDINGS_DIR} 82 105 IDL_INCLUDES Bindings 83 106 FEATURES ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} 84 DESTINATION ${D ERIVED_SOURCES_DIR}/DumpRenderTree107 DESTINATION ${DumpRenderTree_DERIVED_SOURCES_DIR} 85 108 GENERATOR DumpRenderTree) 86 109 110 set(DumpRenderTree_DEPENDENCIES DumpRenderTreeBindings) 111 112 WEBKIT_EXECUTABLE_DECLARE(DumpRenderTree) 87 113 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() 88 89 include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES}) 90 91 add_executable(DumpRenderTree ${DumpRenderTree_SOURCES}) 92 target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES}) 93 add_dependencies(DumpRenderTree DumpRenderTreeBindings) 114 WEBKIT_EXECUTABLE(DumpRenderTree) 94 115 95 116 if (ENABLE_NETSCAPE_PLUGIN_API) 96 117 add_library(TestNetscapePlugIn SHARED ${TestNetscapePlugIn_SOURCES}) 97 target_link_libraries(TestNetscapePlugIn ${TestNetscapePlugIn_LIBRARIES}) 118 target_include_directories(TestNetscapePlugIn PRIVATE ${TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES}) 119 target_link_libraries(TestNetscapePlugIn PRIVATE ${TestNetscapePlugIn_LIBRARIES}) 98 120 endif () 99 100 if (WIN32)101 add_dependencies(DumpRenderTree DumpRenderTreeLib)102 endif () -
trunk/Tools/DumpRenderTree/PlatformWin.cmake
r257587 r259617 1 set(DumpRenderTreeLib_SOURCES 2 ${DumpRenderTree_SOURCES} 3 1 list(APPEND DumpRenderTree_SOURCES 4 2 win/AccessibilityControllerWin.cpp 5 3 win/AccessibilityUIElementWin.cpp … … 26 24 ) 27 25 28 list(APPEND TestNetscapePlugIn_LIBRARIES29 WebKitLegacy30 )31 32 set(DumpRenderTree_SOURCES33 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp34 )35 36 26 list(APPEND TestNetscapePlugIn_SOURCES 37 27 win/TestNetscapePlugin.def … … 51 41 ) 52 42 53 if (${WTF_PLATFORM_WIN_CAIRO}) 54 add_definitions(-DWIN_CAIRO) 55 endif () 43 set(wrapper_DEFINITIONS USE_CONSOLE_ENTRY_POINT) 56 44 57 45 list(APPEND TestNetscapePlugIn_LIBRARIES … … 61 49 ) 62 50 63 list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES 64 # FIXME: Remove this when cleaning up dependencies https://bugs.webkit.org/show_bug.cgi?id=196734 65 ${PAL_FRAMEWORK_HEADERS_DIR} 66 win 67 TestNetscapePlugIn 68 TestNetscapePlugIn/ForwardingHeaders 69 TestNetscapePlugIn/Tests 70 TestNetscapePlugIn/win 71 TestNetscapePlugIn/Tests/win 51 list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES 52 ${DumpRenderTree_DIR}/win 72 53 ) 73 54 74 set(DumpRenderTreeLib_LIBRARIES 75 ${DumpRenderTree_LIBRARIES} 55 list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES 56 ${DumpRenderTree_DIR}/TestNetscapePlugIn/win 57 ${DumpRenderTree_DIR}/TestNetscapePlugIn/Tests/win 58 ) 59 60 list(APPEND DumpRenderTree_LIBRARIES 76 61 Comsuppw 77 62 Oleacc … … 80 65 ) 81 66 82 set(DumpRenderTree_LIBRARIES83 shlwapi84 )85 86 67 if (${WTF_PLATFORM_WIN_CAIRO}) 87 list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES 88 cairo 68 list(APPEND wrapper_DEFINITIONS WIN_CAIRO) 69 list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES 70 ${DumpRenderTree_DIR}/cairo 89 71 ) 90 list(APPEND DumpRenderTree Lib_LIBRARIES72 list(APPEND DumpRenderTree_LIBRARIES 91 73 Cairo::Cairo 92 74 ) 93 list(APPEND DumpRenderTree Lib_SOURCES75 list(APPEND DumpRenderTree_SOURCES 94 76 cairo/PixelDumpSupportCairo.cpp 95 77 ) 96 78 else () 97 list(APPEND DumpRenderTree Lib_LIBRARIES79 list(APPEND DumpRenderTree_LIBRARIES 98 80 CFNetwork 99 81 CoreText 100 82 ) 101 83 if (${USE_DIRECT2D}) 102 list(APPEND DumpRenderTree Lib_SOURCES84 list(APPEND DumpRenderTree_SOURCES 103 85 win/PixelDumpSupportDirect2D.cpp 104 86 ) 105 list(APPEND DumpRenderTree Lib_LIBRARIES87 list(APPEND DumpRenderTree_LIBRARIES 106 88 D2d1 107 89 ) 108 90 else () 109 list(APPEND DumpRenderTree_ INCLUDE_DIRECTORIES110 cg91 list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES 92 ${DumpRenderTree_DIR}/cg 111 93 ) 112 list(APPEND DumpRenderTree Lib_SOURCES94 list(APPEND DumpRenderTree_SOURCES 113 95 cg/PixelDumpSupportCG.cpp 114 96 ) 115 list(APPEND DumpRenderTree Lib_LIBRARIES97 list(APPEND DumpRenderTree_LIBRARIES 116 98 CoreGraphics 117 99 ) … … 119 101 endif () 120 102 121 WEBKIT_ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTree Lib_SOURCES)103 WEBKIT_ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTree_SOURCES) 122 104 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}") 123 add_definitions(-DUSE_CONSOLE_ENTRY_POINT)124 105 125 add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES}) 126 target_link_libraries(DumpRenderTreeLib ${DumpRenderTreeLib_LIBRARIES}) 127 128 add_definitions(-D_UNICODE) 106 WEBKIT_WRAP_EXECUTABLE(DumpRenderTree 107 SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp 108 LIBRARIES shlwapi 109 ) 110 target_compile_definitions(DumpRenderTree PRIVATE ${wrapper_DEFINITIONS})
Note: See TracChangeset
for help on using the changeset viewer.