Changeset 257565 in webkit
- Timestamp:
- Feb 27, 2020 6:36:58 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
-
ChangeLog (modified) (1 diff)
-
Source/cmake/WebKitFS.cmake (modified) (1 diff)
-
Tools/ChangeLog (modified) (1 diff)
-
Tools/MiniBrowser/gtk/CMakeLists.txt (modified) (3 diffs)
-
Tools/MiniBrowser/win/CMakeLists.txt (modified) (6 diffs)
-
Tools/MiniBrowser/wpe/CMakeLists.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r257562 r257565 1 2020-02-27 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] Use WEBKIT_EXECUTABLE in MiniBrowser 4 https://bugs.webkit.org/show_bug.cgi?id=206894 5 6 Reviewed by Adrian Perez de Castro. 7 8 Add a MiniBrowser derived sources directory. 9 10 * Source/cmake/WebKitFS.cmake: 11 1 12 2020-02-27 Adrian Perez de Castro <aperez@igalia.com> 2 13 -
trunk/Source/cmake/WebKitFS.cmake
r245723 r257565 48 48 set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit") 49 49 set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI") 50 set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser") 50 51 51 52 set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders) -
trunk/Tools/ChangeLog
r257553 r257565 1 2020-02-27 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] Use WEBKIT_EXECUTABLE in MiniBrowser 4 https://bugs.webkit.org/show_bug.cgi?id=206894 5 6 Reviewed by Adrian Perez de Castro. 7 8 Modify CMake ports to use WEBKIT_EXECUTABLE when creating their respective 9 MiniBrowsers. 10 11 * MiniBrowser/gtk/CMakeLists.txt: 12 * MiniBrowser/win/CMakeLists.txt: 13 * MiniBrowser/wpe/CMakeLists.txt: 14 1 15 2020-02-26 Alex Christensen <achristensen@webkit.org> 2 16 -
trunk/Tools/MiniBrowser/gtk/CMakeLists.txt
r228818 r257565 1 set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/gtk") 2 set(DERIVED_SOURCES_MINIBROWSER_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser") 1 set(MiniBrowser_DIR "${TOOLS_DIR}/MiniBrowser/gtk") 3 2 4 file(MAKE_DIRECTORY ${ DERIVED_SOURCES_MINIBROWSER_DIR})3 file(MAKE_DIRECTORY ${MiniBrowser_DERIVED_SOURCES_DIR}) 5 4 6 5 set(MiniBrowser_SOURCES 7 ${ DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c8 ${MINIBROWSER_DIR}/BrowserCellRendererVariant.c9 ${MINIBROWSER_DIR}/BrowserCellRendererVariant.h10 ${MINIBROWSER_DIR}/BrowserDownloadsBar.c11 ${MINIBROWSER_DIR}/BrowserDownloadsBar.h12 ${MINIBROWSER_DIR}/BrowserSearchBar.c13 ${MINIBROWSER_DIR}/BrowserSearchBar.h14 ${MINIBROWSER_DIR}/BrowserSettingsDialog.c15 ${MINIBROWSER_DIR}/BrowserSettingsDialog.h16 ${MINIBROWSER_DIR}/BrowserTab.c17 ${MINIBROWSER_DIR}/BrowserTab.h18 ${MINIBROWSER_DIR}/BrowserWindow.c19 ${MINIBROWSER_DIR}/BrowserWindow.h20 ${MINIBROWSER_DIR}/main.c6 ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c 7 BrowserCellRendererVariant.c 8 BrowserCellRendererVariant.h 9 BrowserDownloadsBar.c 10 BrowserDownloadsBar.h 11 BrowserSearchBar.c 12 BrowserSearchBar.h 13 BrowserSettingsDialog.c 14 BrowserSettingsDialog.h 15 BrowserTab.c 16 BrowserTab.h 17 BrowserWindow.c 18 BrowserWindow.h 19 main.c 21 20 ) 22 21 23 set(MiniBrowser_INCLUDE_DIRECTORIES 24 ${DERIVED_SOURCES_MINIBROWSER_DIR} 22 set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES 23 ${CMAKE_BINRARY_DIR} 24 ${MiniBrowser_DERIVED_SOURCES_DIR} 25 25 ${DERIVED_SOURCES_WEBKIT2GTK_DIR} 26 26 ${FORWARDING_HEADERS_WEBKIT2GTK_DIR} … … 36 36 ) 37 37 38 set(MiniBrowser_ LIBRARIES38 set(MiniBrowser_PRIVATE_LIBRARIES 39 39 ${JavaScriptCore_LIBRARY_NAME} 40 40 WebKit … … 45 45 ) 46 46 47 set(MiniBrowser_DEPENDENCIES 48 NetworkProcess 49 WebProcess 50 ) 51 47 52 add_custom_command( 48 OUTPUT ${ DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c49 ${ DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h50 MAIN_DEPENDENCY ${M INIBROWSER_DIR}/browser-marshal.list51 COMMAND glib-genmarshal --prefix=browser_marshal ${M INIBROWSER_DIR}/browser-marshal.list --body > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c52 COMMAND glib-genmarshal --prefix=browser_marshal ${M INIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h53 OUTPUT ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c 54 ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h 55 MAIN_DEPENDENCY ${MiniBrowser_DIR}/browser-marshal.list 56 COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c 57 COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h 53 58 VERBATIM) 54 59 60 set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) 55 61 if (DEVELOPER_MODE) 56 add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")62 list(APPEND MiniBrowser_PRIVATE_DEFINITIONS -DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") 57 63 endif () 58 64 59 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) 60 61 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) 62 include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) 63 add_executable(MiniBrowser ${MiniBrowser_SOURCES}) 64 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) 65 65 WEBKIT_EXECUTABLE_DECLARE(MiniBrowser) 66 WEBKIT_EXECUTABLE(MiniBrowser) 66 67 WEBKIT_ADD_TARGET_CXX_FLAGS(MiniBrowser -Wno-unused-parameter) 67 68 -
trunk/Tools/MiniBrowser/win/CMakeLists.txt
r252872 r257565 1 set(MiniBrowser_INCLUDE_DIRECTORIES 2 ${PAL_FRAMEWORK_HEADERS_DIR} 3 ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR} 1 set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES 2 ${CMAKE_BINARY_DIR} 4 3 ) 5 4 … … 13 12 ) 14 13 15 set(MiniBrowser_ LIBRARIES16 DbgHelp 14 set(MiniBrowser_PRIVATE_DEFINITIONS _UNICODE) 15 set(MiniBrowser_PRIVATE_LIBRARIES 17 16 WebKit::WTF 18 17 comctl32 19 comsupp20 comsuppw21 18 shlwapi 19 user32 22 20 ) 23 21 22 if (${WTF_PLATFORM_WIN_CAIRO}) 23 list(APPEND MiniBrowser_PRIVATE_DEFINITIONS WIN_CAIRO) 24 endif () 25 24 26 if (USE_CF) 25 list(APPEND MiniBrowser_ LIBRARIES27 list(APPEND MiniBrowser_PRIVATE_LIBRARIES 26 28 ${COREFOUNDATION_LIBRARY} 27 29 ) … … 29 31 30 32 if (ENABLE_WEBKIT_LEGACY) 31 add_definitions(-DENABLE_WEBKIT_LEGACY)33 list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT_LEGACY) 32 34 list(APPEND MiniBrowser_INCLUDE_DIRECTORIES 33 35 ${WebKitLegacy_FRAMEWORK_HEADERS_DIR} … … 41 43 WebKitLegacyBrowserWindow.cpp 42 44 ) 43 list(APPEND MiniBrowser_ LIBRARIES45 list(APPEND MiniBrowser_PRIVATE_LIBRARIES 44 46 WebKitLegacy 45 47 WebKitLegacyGUID … … 48 50 49 51 if (ENABLE_WEBKIT) 50 add_definitions(-DENABLE_WEBKIT)52 list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT) 51 53 list(APPEND MiniBrowser_INCLUDE_DIRECTORIES 52 54 ${WebKit_FRAMEWORK_HEADERS_DIR} … … 56 58 WebKitBrowserWindow.cpp 57 59 ) 58 list(APPEND MiniBrowser_ LIBRARIES60 list(APPEND MiniBrowser_PRIVATE_LIBRARIES 59 61 WebKit 62 ) 63 list(APPEND MiniBrowser_DEPENDENCIES 64 NetworkProcess 65 WebKitFrameworkHeaders 66 WebProcess 60 67 ) 61 68 endif () 62 69 63 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}") 64 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup") 65 66 if (${WTF_PLATFORM_WIN_CAIRO}) 67 add_definitions(-DWIN_CAIRO) 68 endif () 69 add_definitions(-D_UNICODE) 70 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) 71 add_library(MiniBrowserLib SHARED ${MiniBrowser_SOURCES}) 72 target_link_libraries(MiniBrowserLib ${MiniBrowser_LIBRARIES}) 73 74 add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.rc) 75 target_link_libraries(MiniBrowser shlwapi) 76 set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME "MiniBrowser") 77 78 add_dependencies(MiniBrowser MiniBrowserLib) 70 WEBKIT_EXECUTABLE_DECLARE(MiniBrowser) 71 WEBKIT_WRAP_EXECUTABLE(MiniBrowser 72 SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.rc 73 LIBRARIES shlwapi 74 ) 75 WEBKIT_EXECUTABLE(MiniBrowser) 76 set_target_properties(MiniBrowser PROPERTIES WIN32_EXECUTABLE ON) -
trunk/Tools/MiniBrowser/wpe/CMakeLists.txt
r257053 r257565 1 set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/wpe")2 3 1 set(MiniBrowser_SOURCES 4 ${MINIBROWSER_DIR}/main.cpp2 main.cpp 5 3 ) 6 4 7 set(MiniBrowser_INCLUDE_DIRECTORIES 5 set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES 6 ${CMAKE_BINARY_DIR} 8 7 ${TOOLS_DIR}/wpe/backends/ 9 8 ${DERIVED_SOURCES_WPE_API_DIR} … … 17 16 ) 18 17 19 set(MiniBrowser_ LIBRARIES18 set(MiniBrowser_PRIVATE_LIBRARIES 20 19 WPE::libwpe 21 20 WPEToolingBackends … … 26 25 ) 27 26 27 set(MiniBrowser_DEPENDENCIES 28 NetworkProcess 29 WebProcess 30 ) 31 28 32 if (DEVELOPER_MODE) 29 add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")33 list(APPEND MiniBrowser_PRIVATE_DEFINITIONS WEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") 30 34 endif () 31 35 32 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) 33 include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) 34 add_executable(MiniBrowser ${MiniBrowser_SOURCES}) 35 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) 36 WEBKIT_EXECUTABLE_DECLARE(MiniBrowser) 37 WEBKIT_EXECUTABLE(MiniBrowser) 36 38 37 39 install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")
Note: See TracChangeset
for help on using the changeset viewer.
