Attachment 362609 Details for Bug 194901 – Patch

[patch] Patch

bug-194901-20190221182143.patch (text/plain), 2.95 KB, created by Adrian Perez on 2019-02-21 08:21:45 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2019-02-21 08:21:45 PST

Size: 2.95 KB

patch

obsolete

>Subversion Revision: 241865
>diff --git a/Source/cmake/FindWPEBackend-fdo.cmake b/Source/cmake/FindWPEBackend-fdo.cmake
>index 2b63ad8583a49b2915af4cc3476b4d18c0a9c969..2a58751b10c7f0876d7fb414e36a7c0f5b5567a7 100644
>--- a/Source/cmake/FindWPEBackend-fdo.cmake
>+++ b/Source/cmake/FindWPEBackend-fdo.cmake
>@@ -44,4 +44,4 @@ find_library(WPEBACKEND_FDO_LIBRARIES
> mark_as_advanced(WPEBACKEND_FDO_INCLUDE_DIRS WPEBACKEND_FDO_LIBRARIES)
> 
> include(FindPackageHandleStandardArgs)
>-find_package_handle_standard_args(WPEBackend-fdo REQUIRED_VARS WPEBACKEND_FDO_INCLUDE_DIRS WPEBACKEND_FDO_LIBRARIES)
>+find_package_handle_standard_args(WPEBACKEND_FDO REQUIRED_VARS WPEBACKEND_FDO_INCLUDE_DIRS WPEBACKEND_FDO_LIBRARIES)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 4f32b37f60af1e516528fe5da88f4c1dda354310..acbbe25aee018c70ad13c97f96792d145189c677 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-02-21  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [WPE] Do not hardcode WPEBackend-fdo library name for linking tests
>+        https://bugs.webkit.org/show_bug.cgi?id=194901
>+
>+        Unreviewed build fix.
>+
>+        * TestWebKitAPI/PlatformWPE.cmake: Set TestWebKitAPIBase to be linked
>+        against the detected ${WPEBACKEND_FDO_LIBRARIES} instead of hardcoding
>+        WPEBackend-fdo-0.1 as library name.
>+
> 2019-02-21  Rob Buis  <rbuis@igalia.com>
> 
>         Update MIME type parser
>diff --git a/Tools/TestWebKitAPI/PlatformWPE.cmake b/Tools/TestWebKitAPI/PlatformWPE.cmake
>index 584e8b149b570ddca5cc3323af4b0dd85dea3d0d..26d0e9a7b78031a51f9701fa0a64e1468eefcbb9 100644
>--- a/Tools/TestWebKitAPI/PlatformWPE.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWPE.cmake
>@@ -93,10 +93,7 @@ set_tests_properties(TestWebKit PROPERTIES TIMEOUT 60)
> set_target_properties(TestWebKit PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit)
> 
> # TestWebKitAPIBase
>-list(APPEND TestWebKitAPIBase_LIBRARIES
>-    WPEBackend-fdo-0.1
>-)
>-find_package(WPEBackend-fdo REQUIRED)
>+list(APPEND TestWebKitAPIBase_LIBRARIES ${WPEBACKEND_FDO_LIBRARIES})
> list(APPEND TestWebKitAPI_LIBRARIES ${WPEBACKEND_FDO_LIBRARIES})
> list(APPEND TestWebKitAPIBase_SOURCES
>     ${TOOLS_DIR}/wpe/backends/ViewBackend.cpp
>diff --git a/ChangeLog b/ChangeLog
>index 031b5e2547a3f4b7c2eb4382b9159f0e977fd18a..e268e87a207aabe44f3e21c7a209e766a36e3510 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-02-21  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [WPE] Do not hardcode WPEBackend-fdo library name for linking tests
>+        https://bugs.webkit.org/show_bug.cgi?id=194901
>+
>+        Unreviewed build fix.
>+
>+        * Source/cmake/FindWPEBackend-fdo.cmake: Use WPEBACKEND_FDO as prefix
>+        for the output variables instead of WPEBackend-fdo, for consistency
>+        with other usages of of find_package_handle_standard_args().
>+
> 2019-02-11  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [GTK][WPE] Add content extensions support in WKTR and unskip layout tests

Actions: View | Formatted Diff | Diff

Attachments on bug 194901: 362609