Skip to content
Permalink
Browse files
[WPE] Fix CMake rules in for TestWebKitAPIBase library building in de…
…veloper mode

https://bugs.webkit.org/show_bug.cgi?id=190328

Patch by Pablo Saavedra <psaavedra@igalia.com> on 2018-10-24
Reviewed by Michael Catanzaro.

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

Canonical link: https://commits.webkit.org/205734@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237390 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
psaavedra authored and webkit-commit-queue committed Oct 24, 2018
1 parent 8cf1343 commit f49dd8cf96733f09df8f21d29ea9845440990e60
Showing with 36 additions and 4 deletions.
  1. +10 −0 Tools/ChangeLog
  2. +15 −4 Tools/TestWebKitAPI/CMakeLists.txt
  3. +11 −0 Tools/TestWebKitAPI/PlatformWPE.cmake
@@ -1,3 +1,13 @@
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>

[PSON] When navigating back and forth, 'about:blank' shows up in the back/forward list
@@ -85,6 +85,19 @@ if (ENABLE_WEBKIT)
${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
)

list(APPEND TestWebKitAPI_LIBRARIES
WebKit
)
@@ -273,12 +286,10 @@ if (ENABLE_WEBKIT)
add_library(TestWebKitAPIBase
${test_main_SOURCES}
${webkit_api_harness_SOURCES}
${TESTWEBKITAPI_DIR}/JavaScriptTest.cpp
${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
${TESTWEBKITAPI_DIR}/TestsController.cpp
${TestWebKitAPIBase_SOURCES}
)

target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit gtest)
target_link_libraries(TestWebKitAPIBase ${TestWebKitAPIBase_LIBRARIES})

add_dependencies(TestWebKitAPIBase WebKit ${TestWebKitAPI_DEPENDENCIES})

@@ -89,6 +89,17 @@ add_test(TestWebKit ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/TestWebKit)
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}")

0 comments on commit f49dd8c

Please sign in to comment.