Title: [237390] trunk/Tools
- Revision
- 237390
- Author
- [email protected]
- Date
- 2018-10-24 10:44:21 -0700 (Wed, 24 Oct 2018)
Log 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 <[email protected]> on 2018-10-24
Reviewed by Michael Catanzaro.
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/PlatformWPE.cmake:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (237389 => 237390)
--- trunk/Tools/ChangeLog 2018-10-24 17:18:55 UTC (rev 237389)
+++ trunk/Tools/ChangeLog 2018-10-24 17:44:21 UTC (rev 237390)
@@ -1,3 +1,13 @@
+2018-10-24 Pablo Saavedra <[email protected]>
+
+ [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 <[email protected]>
[PSON] When navigating back and forth, 'about:blank' shows up in the back/forward list
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (237389 => 237390)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2018-10-24 17:18:55 UTC (rev 237389)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2018-10-24 17:44:21 UTC (rev 237390)
@@ -85,6 +85,19 @@
${TESTWEBKITAPI_DIR}/Tests/WebKit/WKURL.cpp
)
+ set(TestWebKitAPIBase_LIBRARIES
+ _javascript_Core
+ WTF
+ WebKit
+ gtest
+ )
+
+ set(TestWebKitAPIBase_SOURCES
+ ${TESTWEBKITAPI_DIR}/_javascript_Test.cpp
+ ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
+ ${TESTWEBKITAPI_DIR}/TestsController.cpp
+ )
+
list(APPEND TestWebKitAPI_LIBRARIES
WebKit
)
@@ -273,12 +286,10 @@
add_library(TestWebKitAPIBase
${test_main_SOURCES}
${webkit_api_harness_SOURCES}
- ${TESTWEBKITAPI_DIR}/_javascript_Test.cpp
- ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
- ${TESTWEBKITAPI_DIR}/TestsController.cpp
+ ${TestWebKitAPIBase_SOURCES}
)
- target_link_libraries(TestWebKitAPIBase _javascript_Core WTF WebKit gtest)
+ target_link_libraries(TestWebKitAPIBase ${TestWebKitAPIBase_LIBRARIES})
add_dependencies(TestWebKitAPIBase WebKit ${TestWebKitAPI_DEPENDENCIES})
Modified: trunk/Tools/TestWebKitAPI/PlatformWPE.cmake (237389 => 237390)
--- trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2018-10-24 17:18:55 UTC (rev 237389)
+++ trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2018-10-24 17:44:21 UTC (rev 237390)
@@ -89,6 +89,17 @@
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 TestWebKitAPI_LIBRARIES ${WPEBACKEND_FDO_LIBRARIES})
+list(APPEND TestWebKitAPIBase_SOURCES
+ ${TOOLS_DIR}/wpe/backends/ViewBackend.cpp
+ ${TOOLS_DIR}/wpe/backends/HeadlessViewBackend.cpp
+)
+
# TestJSC
add_definitions(-DWEBKIT_SRC_DIR="${CMAKE_SOURCE_DIR}")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
