Merged r241866 - [WPE] Do not hardcode WPEBackend-fdo library name fo…

…r 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(). 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.
WebKit · Feb 21, 2019 · c075e70 · c075e70
1 parent 6e09ca1
commit c075e70
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git 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-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.23.91 release

diff --git 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
@@ -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-20  Adrian Perez de Castro  <aperez@igalia.com>
 
         [WPE][GTK] Enable support for CONTENT_EXTENSIONS

diff --git 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