Changeset 259563 in webkit


Ignore:
Timestamp:
Apr 5, 2020 9:22:04 PM (4 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake] Use WEBKIT_EXECUTABLE in MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=206894

Reviewed by Adrian Perez de Castro.

.:

Add a MiniBrowser derived sources directory.

  • Source/cmake/WebKitFS.cmake:

Tools:

Modify CMake ports to use WEBKIT_EXECUTABLE when creating their respective
MiniBrowsers.

  • MiniBrowser/gtk/CMakeLists.txt:
  • MiniBrowser/win/CMakeLists.txt:
  • MiniBrowser/wpe/CMakeLists.txt:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r259560 r259563  
     12020-04-05  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
    1122020-04-05  Don Olmstead  <don.olmstead@sony.com>
    213

  • trunk/Source/cmake/WebKitFS.cmake

    r257679 r259563  
    4848set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
    4949set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
     50set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
    5051
    5152set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)

  • trunk/Tools/ChangeLog

    r259560 r259563  
     12020-04-05  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
    1152020-04-05  Don Olmstead  <don.olmstead@sony.com>
    216

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

    r257679 r259563  
    1 set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/gtk")
    2 set(DERIVED_SOURCES_MINIBROWSER_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
     1set(MiniBrowser_DIR "${TOOLS_DIR}/MiniBrowser/gtk")
    32
    4 file(MAKE_DIRECTORY ${DERIVED_SOURCES_MINIBROWSER_DIR})
     3file(MAKE_DIRECTORY ${MiniBrowser_DERIVED_SOURCES_DIR})
    54
    65set(MiniBrowser_SOURCES
    7     ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
    8     ${MINIBROWSER_DIR}/BrowserCellRendererVariant.c
    9     ${MINIBROWSER_DIR}/BrowserCellRendererVariant.h
    10     ${MINIBROWSER_DIR}/BrowserDownloadsBar.c
    11     ${MINIBROWSER_DIR}/BrowserDownloadsBar.h
    12     ${MINIBROWSER_DIR}/BrowserSearchBar.c
    13     ${MINIBROWSER_DIR}/BrowserSearchBar.h
    14     ${MINIBROWSER_DIR}/BrowserSettingsDialog.c
    15     ${MINIBROWSER_DIR}/BrowserSettingsDialog.h
    16     ${MINIBROWSER_DIR}/BrowserTab.c
    17     ${MINIBROWSER_DIR}/BrowserTab.h
    18     ${MINIBROWSER_DIR}/BrowserWindow.c
    19     ${MINIBROWSER_DIR}/BrowserWindow.h
    20     ${MINIBROWSER_DIR}/main.c
     6    ${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
    2120)
    2221
    23 set(MiniBrowser_INCLUDE_DIRECTORIES
    24     ${DERIVED_SOURCES_MINIBROWSER_DIR}
     22set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
     23    ${CMAKE_BINRARY_DIR}
     24    ${MiniBrowser_DERIVED_SOURCES_DIR}
    2525    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
    2626    ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
    … …  
    3636)
    3737
    38 set(MiniBrowser_LIBRARIES
     38set(MiniBrowser_PRIVATE_LIBRARIES
     39    ${GLIB_LIBRARIES}
     40    ${GSTREAMER_LIBRARIES}
     41    ${GTK3_LIBRARIES}
    3942    ${JavaScriptCore_LIBRARY_NAME}
    40     WebKit
    41     ${GTK3_LIBRARIES}
    42     ${GLIB_LIBRARIES}
    4343    ${LIBSOUP_LIBRARIES}
    44     ${GSTREAMER_LIBRARIES}
     44    WebKit::WebKit
     45)
     46
     47set(MiniBrowser_DEPENDENCIES
     48    NetworkProcess
     49    WebProcess
    4550)
    4651
    4752add_custom_command(
    48     OUTPUT ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
    49            ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
    50     MAIN_DEPENDENCY ${MINIBROWSER_DIR}/browser-marshal.list
    51     COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
    52     COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
     53    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
    5358    VERBATIM)
    5459
     60set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
    5561if (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}")
    5763endif ()
    5864
    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 
     65WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
     66WEBKIT_EXECUTABLE(MiniBrowser)
    6667WEBKIT_ADD_TARGET_CXX_FLAGS(MiniBrowser -Wno-unused-parameter)
    6768

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

    r259560 r259563  
    1 set(MiniBrowser_INCLUDE_DIRECTORIES
    2     ${PAL_FRAMEWORK_HEADERS_DIR}
     1set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
     2    ${CMAKE_BINARY_DIR}
    33    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    44)
    … …  
    1313)
    1414
    15 set(MiniBrowser_LIBRARIES
    16     DbgHelp
     15set(MiniBrowser_PRIVATE_DEFINITIONS _UNICODE)
     16set(MiniBrowser_PRIVATE_LIBRARIES
    1717    WebKit::WTF
    1818    comctl32
    19     comsupp
    20     comsuppw
    2119    shlwapi
     20    user32
    2221)
    2322
    2423if (USE_CF)
    25     list(APPEND MiniBrowser_LIBRARIES
     24    list(APPEND MiniBrowser_PRIVATE_LIBRARIES
    2625        ${COREFOUNDATION_LIBRARY}
    2726    )
    … …  
    2928
    3029if (ENABLE_WEBKIT_LEGACY)
    31     add_definitions(-DENABLE_WEBKIT_LEGACY)
     30    list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT_LEGACY)
    3231    list(APPEND MiniBrowser_INCLUDE_DIRECTORIES
    3332        ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
    … …  
    4140        WebKitLegacyBrowserWindow.cpp
    4241    )
    43     list(APPEND MiniBrowser_LIBRARIES
     42    list(APPEND MiniBrowser_PRIVATE_LIBRARIES
    4443        WebKitLegacy
    4544        WebKitLegacyGUID
    … …  
    4847
    4948if (ENABLE_WEBKIT)
    50     add_definitions(-DENABLE_WEBKIT)
    51     list(APPEND MiniBrowser_INCLUDE_DIRECTORIES
    52         ${WebKit_FRAMEWORK_HEADERS_DIR}
    53         ${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}
    54     )
     49    list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT)
    5550    list(APPEND MiniBrowser_SOURCES
    5651        WebKitBrowserWindow.cpp
    5752    )
    58     list(APPEND MiniBrowser_LIBRARIES
     53    list(APPEND MiniBrowser_PRIVATE_LIBRARIES
    5954        WebKit::WebKit
    6055    )
    6156endif ()
    6257
    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")
     58WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
     59WEBKIT_WRAP_EXECUTABLE(MiniBrowser
     60    SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.rc
     61    LIBRARIES shlwapi
     62)
     63WEBKIT_EXECUTABLE(MiniBrowser)
    6564
     65set_target_properties(MiniBrowser PROPERTIES WIN32_EXECUTABLE ON)
    6666if (${WTF_PLATFORM_WIN_CAIRO})
    67     add_definitions(-DWIN_CAIRO)
     67    target_compile_definitions(MiniBrowser PRIVATE WIN_CAIRO)
    6868endif ()
    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)

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

    r257679 r259563  
    1 set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/wpe")
    2 
    31set(MiniBrowser_SOURCES
    4     ${MINIBROWSER_DIR}/main.cpp
     2    main.cpp
    53)
    64
    7 set(MiniBrowser_INCLUDE_DIRECTORIES
     5set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
     6    ${CMAKE_BINARY_DIR}
    87    ${TOOLS_DIR}/wpe/backends/
    98    ${DERIVED_SOURCES_WPE_API_DIR}
    … …  
    1716)
    1817
    19 set(MiniBrowser_LIBRARIES
    20     WPE::libwpe
    21     WPEToolingBackends
    22     WebKit
     18set(MiniBrowser_PRIVATE_LIBRARIES
    2319    ${ATK_LIBRARIES}
    2420    ${JavaScriptCore_LIBRARY_NAME}
    2521    ${WPEBACKEND_FDO_LIBRARIES}
     22    WPE::libwpe
     23    WPEToolingBackends
     24    WebKit::WebKit
    2625)
    2726
    2827if (DEVELOPER_MODE)
    29     add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
     28    list(APPEND MiniBrowser_PRIVATE_DEFINITIONS WEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
    3029endif ()
    3130
    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})
     31WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
     32WEBKIT_EXECUTABLE(MiniBrowser)
    3633
    3734install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")
Note: See TracChangeset for help on using the changeset viewer.