Changeset 237390 in webkit

Timestamp:

Oct 24, 2018 10:44:21 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[WPE] Fix CMake rules in for TestWebKitAPIBase library building in developer mode
​https://bugs.webkit.org/show_bug.cgi?id=190328

Patch by Pablo Saavedra <Pablo Saavedra> on 2018-10-24
Reviewed by Michael Catanzaro.

• TestWebKitAPI/CMakeLists.txt:
• TestWebKitAPI/PlatformWPE.cmake:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/CMakeLists.txt (modified) (2 diffs)
• TestWebKitAPI/PlatformWPE.cmake (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-10-24  Pablo Saavedra  <psaavedra@igalia.com>
+
+        [WPE] Fix CMake rules in for TestWebKitAPIBase library building in developer mode
+        https://bugs.webkit.org/show_bug.cgi?id=190328
+
+        Reviewed by Michael Catanzaro.
+
+        * TestWebKitAPI/CMakeLists.txt:
+        * TestWebKitAPI/PlatformWPE.cmake:
+
 2018-10-24  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/TestWebKitAPI/CMakeLists.txt

@@ -84 +84 @@
         ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKStringJSString.cpp
         ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKURL.cpp
+    )
+
+    set(TestWebKitAPIBase_LIBRARIES
+        JavaScriptCore
+        WTF
+        WebKit
+        gtest
+    )
+
+    set(TestWebKitAPIBase_SOURCES
+        ${TESTWEBKITAPI_DIR}/JavaScriptTest.cpp
+        ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
+        ${TESTWEBKITAPI_DIR}/TestsController.cpp
     )
 
@@ -274 +287 @@
         ${test_main_SOURCES}
         ${webkit_api_harness_SOURCES}
-        ${TESTWEBKITAPI_DIR}/JavaScriptTest.cpp
-        ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
-        ${TESTWEBKITAPI_DIR}/TestsController.cpp
-    )
-
-    target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit gtest)
+        ${TestWebKitAPIBase_SOURCES}
+    )
+
+    target_link_libraries(TestWebKitAPIBase ${TestWebKitAPIBase_LIBRARIES})
 
     add_dependencies(TestWebKitAPIBase WebKit ${TestWebKitAPI_DEPENDENCIES})

trunk/Tools/TestWebKitAPI/PlatformWPE.cmake

@@ -90 +90 @@
 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 TestWebKitAPI_LIBRARIES ${WPEBACKEND_FDO_LIBRARIES})
+list(APPEND TestWebKitAPIBase_SOURCES
+    ${TOOLS_DIR}/wpe/backends/ViewBackend.cpp
+    ${TOOLS_DIR}/wpe/backends/HeadlessViewBackend.cpp
+)
+
 # TestJSC