⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 287060 in webkit


Ignore:
Timestamp:
Dec 14, 2021, 7:00:46 PM (5 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake] Modernize WPEToolingBackend
​https://bugs.webkit.org/show_bug.cgi?id=234307

Reviewed by Adrian Perez de Castro.

Use WEBKIT_FRAMEWORK to build WPEToolingBackend and follow its conventions. Also support
different platform definitions so other ports using libwpe can also use this library.

Update includes to use <WPEToolingBackend/*.h>.

  • MiniBrowser/wpe/CMakeLists.txt:
  • MiniBrowser/wpe/main.cpp:
  • TestWebKitAPI/PlatformWPE.cmake:
  • TestWebKitAPI/glib/PlatformWPE.cmake:
  • TestWebKitAPI/glib/WebKitGLib/TestMain.h:
  • TestWebKitAPI/wpe/PlatformWebViewWPE.cpp:
  • WebKitTestRunner/PlatformWPE.cmake:
  • WebKitTestRunner/wpe/EventSenderProxyWPE.cpp:
  • WebKitTestRunner/wpe/PlatformWebViewWPE.cpp:
  • wpe/backends/CMakeLists.txt:
  • wpe/backends/PlatformWPE.cmake: Added.
Location:
trunk/Tools
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r287057 r287060  
     12021-12-14  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Modernize WPEToolingBackend
     4        https://bugs.webkit.org/show_bug.cgi?id=234307
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        Use WEBKIT_FRAMEWORK to build WPEToolingBackend and follow its conventions. Also support
     9        different platform definitions so other ports using libwpe can also use this library.
     10
     11        Update includes to use <WPEToolingBackend/*.h>.
     12
     13        * MiniBrowser/wpe/CMakeLists.txt:
     14        * MiniBrowser/wpe/main.cpp:
     15        * TestWebKitAPI/PlatformWPE.cmake:
     16        * TestWebKitAPI/glib/PlatformWPE.cmake:
     17        * TestWebKitAPI/glib/WebKitGLib/TestMain.h:
     18        * TestWebKitAPI/wpe/PlatformWebViewWPE.cpp:
     19        * WebKitTestRunner/PlatformWPE.cmake:
     20        * WebKitTestRunner/wpe/EventSenderProxyWPE.cpp:
     21        * WebKitTestRunner/wpe/PlatformWebViewWPE.cpp:
     22        * wpe/backends/CMakeLists.txt:
     23        * wpe/backends/PlatformWPE.cmake: Added.
     24
    1252021-12-14  Ryan Haddad  <ryanhaddad@apple.com>
    226

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

    r276316 r287060  
    55set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
    66    ${CMAKE_BINARY_DIR}
    7     ${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends
    87    ${DERIVED_SOURCES_WPE_API_DIR}
    98    ${FORWARDING_HEADERS_WPE_DIR}
    109    ${JavaScriptCoreGLib_DERIVED_SOURCES_DIR}
    1110    ${JavaScriptCoreGLib_FRAMEWORK_HEADERS_DIR}
    12     ${TOOLS_DIR}/wpe/backends/
    1311)
    1412
    … …  
    2523    ${WPEBACKEND_FDO_LIBRARIES}
    2624    WPE::libwpe
    27     WPEToolingBackends
     25    WebKit::WPEToolingBackends
    2826    WebKit::WebKit
    2927)

  • trunk/Tools/MiniBrowser/wpe/main.cpp

    r280382 r287060  
    2727
    2828#include "BuildRevision.h"
    29 #include "HeadlessViewBackend.h"
    30 #include "WindowViewBackend.h"
     29#include <WPEToolingBackends/HeadlessViewBackend.h>
     30#include <WPEToolingBackends/WindowViewBackend.h>
    3131#include <memory>
    3232#include <wpe/webkit.h>

  • trunk/Tools/TestWebKitAPI/PlatformWPE.cmake

    r284527 r287060  
    6464    ${FORWARDING_HEADERS_DIR}
    6565    ${WPEBACKEND_FDO_INCLUDE_DIRS}
    66     ${TOOLS_DIR}/wpe/backends
    6766)
    6867
    … …  
    7473list(APPEND TestWebKit_LIBRARIES
    7574    ${WPEBACKEND_FDO_LIBRARIES}
    76     WPEToolingBackends
     75    WebKit::WPEToolingBackends
    7776)
    7877

  • trunk/Tools/TestWebKitAPI/glib/PlatformWPE.cmake

    r279214 r287060  
    1111    ${FORWARDING_HEADERS_WPE_DOM_DIR}
    1212    ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}
    13     ${TOOLS_DIR}/wpe/backends
    1413)
    1514
    … …  
    2019list(APPEND WebKitGLibAPITestsCore_LIBRARIES
    2120    Cairo::Cairo
    22     WPEToolingBackends
     21    WebKit::WPEToolingBackends
    2322)
    2423
    2524list(APPEND WebKitGLibAPITest_LIBRARIES
     25    ${WPEBACKEND_FDO_LIBRARIES}
    2626    Cairo::Cairo
    27     ${WPEBACKEND_FDO_LIBRARIES}
    2827    WPE::libwpe
    29     WPEToolingBackends
     28    WebKit::WPEToolingBackends
    3029)

  • trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h

    r280155 r287060  
    3232#include <webkit2/webkit2.h>
    3333#elif PLATFORM(WPE)
    34 #include "HeadlessViewBackend.h"
     34#include <WPEToolingBackends/HeadlessViewBackend.h>
    3535#include <wpe/webkit.h>
    3636#endif

  • trunk/Tools/TestWebKitAPI/wpe/PlatformWebViewWPE.cpp

    r232670 r287060  
    2727#include "PlatformWebView.h"
    2828
    29 #include "HeadlessViewBackend.h"
     29#include <WPEToolingBackends/HeadlessViewBackend.h>
    3030#include <WebKit/WKRetainPtr.h>
    3131#include <WebKit/WKView.h>

  • trunk/Tools/WebKitTestRunner/PlatformWPE.cmake

    r284527 r287060  
    1616list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
    1717    ${FORWARDING_HEADERS_DIR}
    18     ${TOOLS_DIR}/wpe/backends
    1918)
    2019
    … …  
    3130    ${WPEBACKEND_FDO_LIBRARIES}
    3231    Cairo::Cairo
    33     WPEToolingBackends
     32    WebKit::WPEToolingBackends
    3433)
    3534

  • trunk/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp

    r284575 r287060  
    2727#include "EventSenderProxy.h"
    2828
    29 #include "HeadlessViewBackend.h"
    3029#include "PlatformWebView.h"
    3130#include "TestController.h"
     31#include <WPEToolingBackends/HeadlessViewBackend.h>
    3232#include <WebCore/NotImplemented.h>
    3333#include <wpe/wpe.h>

  • trunk/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp

    r280288 r287060  
    2727#include "PlatformWebView.h"
    2828
    29 #include "HeadlessViewBackend.h"
     29#include <WPEToolingBackends/HeadlessViewBackend.h>
    3030#include <WebKit/WKImageCairo.h>
    3131#include <cairo.h>

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

    r275111 r287060  
    1 find_package(Libxkbcommon 0.4.0 REQUIRED)
    2 find_package(Wayland REQUIRED)
    3 find_package(WaylandProtocols 1.12 REQUIRED)
    4 find_package(WPEBackend_fdo 1.3.0 REQUIRED)
     1set(WPEToolingBackends_LIBRARY_TYPE STATIC)
     2set(WPEToolingBackends_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/WPEToolingBackends/DerivedSources")
     3set(WPEToolingBackends_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/WPEToolingBackends/Headers")
    54
    6 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR})
     5file(MAKE_DIRECTORY ${WPEToolingBackends_DERIVED_SOURCES_DIR})
     6
     7set(WPEToolingBackends_PUBLIC_HEADERS
     8    HeadlessViewBackend.h
     9    ViewBackend.h
     10    WindowViewBackend.h
     11)
    712
    813set(WPEToolingBackends_SOURCES
    9     ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR}/xdg-shell-unstable-v6-protocol.c
    10     ${TOOLS_DIR}/wpe/backends/HeadlessViewBackend.cpp
    11     ${TOOLS_DIR}/wpe/backends/ViewBackend.cpp
    12     ${TOOLS_DIR}/wpe/backends/WebKitAccessibleApplication.cpp
    13     ${TOOLS_DIR}/wpe/backends/WindowViewBackend.cpp
     14    HeadlessViewBackend.cpp
     15    ViewBackend.cpp
     16    WebKitAccessibleApplication.cpp
     17    WindowViewBackend.cpp
    1418)
    1519
    16 set(WPEToolingBackends_INCLUDE_DIRECTORIES
    17     ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR}
    18 )
    19 
    20 set(WPEToolingBackends_SYSTEM_INCLUDE_DIRECTORIES
    21     ${ATK_INCLUDE_DIRS}
    22     ${GLIB_INCLUDE_DIRS}
    23     ${LIBEPOXY_INCLUDE_DIRS}
    24     ${WPEBACKEND_FDO_INCLUDE_DIRS}
     20set(WPEToolingBackends_PRIVATE_INCLUDE_DIRECTORIES
     21    ${WPEToolingBackends_DERIVED_SOURCES_DIR}
     22    ${TOOLS_DIR}/wpe/backends
    2523)
    2624
    … …  
    2826    Cairo::Cairo
    2927    WPE::libwpe
    30     ${ATK_LIBRARIES}
    31     ${GLIB_LIBRARIES}
    32     ${LIBEPOXY_LIBRARIES}
    33     ${LIBXKBCOMMON_LIBRARIES}
    34     ${WAYLAND_LIBRARIES}
    35     ${WPEBACKEND_FDO_LIBRARIES}
    3628)
    3729
    38 add_definitions(${LIBEPOXY_DEFINITIONS})
     30set(WPEToolingBackends_INTERFACE_LIBRARIES WPEToolingBackends)
     31set(WPEToolingBackends_INTERFACE_INCLUDE_DIRECTORIES ${WPEToolingBackends_FRAMEWORK_HEADERS_DIR})
     32set(WPEToolingBackends_INTERFACE_DEPENDENCIES WPEToolingBackends_CopyHeaders)
    3933
    40 add_custom_command(
    41     OUTPUT ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR}/xdg-shell-unstable-v6-protocol.c
    42     MAIN_DEPENDENCY ${WAYLAND_PROTOCOLS_DATADIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml
    43     DEPENDS ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR}/xdg-shell-unstable-v6-client-protocol.h
    44     COMMAND ${WAYLAND_SCANNER} code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR}/xdg-shell-unstable-v6-protocol.c
    45     VERBATIM)
     34WEBKIT_FRAMEWORK_DECLARE(WPEToolingBackends)
     35WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    4636
    47 add_custom_command(
    48     OUTPUT ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR}/xdg-shell-unstable-v6-client-protocol.h
    49     MAIN_DEPENDENCY ${WAYLAND_PROTOCOLS_DATADIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml
    50     COMMAND ${WAYLAND_SCANNER} client-header ${WAYLAND_PROTOCOLS_DATADIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR}/xdg-shell-unstable-v6-client-protocol.h
    51     VERBATIM)
     37WEBKIT_COPY_FILES(WPEToolingBackends_CopyHeaders
     38    DESTINATION ${WPEToolingBackends_FRAMEWORK_HEADERS_DIR}/WPEToolingBackends
     39    FILES ${WPEToolingBackends_PUBLIC_HEADERS}
     40    FLATTENED
     41)
    5242
    53 if (ENABLE_ACCESSIBILITY)
    54     add_definitions(-DHAVE_ACCESSIBILITY=1)
    55     add_definitions(-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40)
    56     list(APPEND WPEToolingBackends_LIBRARIES ATK::Bridge)
    57 endif ()
    58 
    59 add_library(WPEToolingBackends STATIC ${WPEToolingBackends_SOURCES})
    60 include_directories(${WPEToolingBackends_INCLUDE_DIRECTORIES})
    61 include_directories(SYSTEM ${WPEToolingBackends_SYSTEM_INCLUDE_DIRECTORIES})
    62 target_link_libraries(WPEToolingBackends ${WPEToolingBackends_LIBRARIES})
     43WEBKIT_FRAMEWORK(WPEToolingBackends)
     44WEBKIT_FRAMEWORK_TARGET(WPEToolingBackends)
Note: See TracChangeset for help on using the changeset viewer.