[WPE] Do not hardcode WPEBackend-fdo library name for linking tests
authoraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Feb 2019 17:08:07 +0000 (17:08 +0000)
committeraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Feb 2019 17:08:07 +0000 (17:08 +0000)
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().

Tools:

* TestWebKitAPI/PlatformWPE.cmake: Set TestWebKitAPIBase to be linked
against the detected ${WPEBACKEND_FDO_LIBRARIES} instead of hardcoding
WPEBackend-fdo-0.1 as library name.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/cmake/FindWPEBackend-fdo.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/PlatformWPE.cmake

index 031b5e2..e268e87 100644 (file)
--- 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
index 2b63ad8..2a58751 100644 (file)
@@ -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)
index 4f32b37..acbbe25 100644 (file)
@@ -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
index 584e8b1..26d0e9a 100644 (file)
@@ -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