diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-23 09:28:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-23 09:28:44 +0200 |
| commit | 815f1ed417bd26fbe2abbdf20ac5d3423b30796c (patch) | |
| tree | 923c9a9e2834ccab60f5caecfb8f0ac410c1dd9e /Source/WebKit2/PlatformEfl.cmake | |
| parent | b4ad5d9d2b96baacd0180ead50de5195ca78af2d (diff) | |
| download | qtwebkit-815f1ed417bd26fbe2abbdf20ac5d3423b30796c.tar.gz | |
Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92 (http://svn.webkit.org/repository/webkit/trunk@123308)
New snapshot with better configure tests
Diffstat (limited to 'Source/WebKit2/PlatformEfl.cmake')
| -rw-r--r-- | Source/WebKit2/PlatformEfl.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake index db0e45914..97f7095a6 100644 --- a/Source/WebKit2/PlatformEfl.cmake +++ b/Source/WebKit2/PlatformEfl.cmake @@ -37,6 +37,7 @@ LIST(APPEND WebKit2_SOURCES UIProcess/API/efl/BatteryProvider.cpp UIProcess/API/efl/PageClientImpl.cpp UIProcess/API/efl/ewk_context.cpp + UIProcess/API/efl/ewk_cookie_manager.cpp UIProcess/API/efl/ewk_intent.cpp UIProcess/API/efl/ewk_intent_service.cpp UIProcess/API/efl/ewk_navigation_policy_decision.cpp @@ -54,7 +55,7 @@ LIST(APPEND WebKit2_SOURCES UIProcess/efl/TextCheckerEfl.cpp UIProcess/efl/WebContextEfl.cpp UIProcess/efl/WebFullScreenManagerProxyEfl.cpp - UIProcess/efl/WebInspectorEfl.cpp + UIProcess/efl/WebInspectorProxyEfl.cpp UIProcess/efl/WebPageProxyEfl.cpp UIProcess/efl/WebPreferencesEfl.cpp @@ -70,8 +71,8 @@ LIST(APPEND WebKit2_SOURCES WebProcess/Cookies/soup/WebCookieManagerSoup.cpp WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp - WebProcess/Downloads/efl/DownloadEfl.cpp - WebProcess/Downloads/efl/FileDownloaderEfl.cpp + WebProcess/Downloads/efl/DownloadSoupErrorsEfl.cpp + WebProcess/Downloads/soup/DownloadSoup.cpp WebProcess/efl/WebProcessEfl.cpp WebProcess/efl/WebProcessMainEfl.cpp @@ -108,7 +109,7 @@ LIST(APPEND WebKit2_INCLUDE_DIRECTORIES "${WEBKIT2_DIR}/UIProcess/API/C/soup" "${WEBKIT2_DIR}/UIProcess/API/efl" "${WEBKIT2_DIR}/UIProcess/soup" - "${WEBKIT2_DIR}/WebProcess/Downloads/efl" + "${WEBKIT2_DIR}/WebProcess/Downloads/soup" "${WEBKIT2_DIR}/WebProcess/efl" "${WEBKIT2_DIR}/WebProcess/soup" "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/efl" @@ -172,6 +173,7 @@ CONFIGURE_FILE(efl/ewebkit2.pc.in ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc @O SET (EWebKit2_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/EWebKit2.h" "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_context.h" + "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_cookie_manager.h" "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intent.h" "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intent_service.h" "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_navigation_policy_decision.h" @@ -209,6 +211,7 @@ SET(WEBKIT2_EFL_TEST_DIR "${WEBKIT2_DIR}/UIProcess/API/efl/tests") SET(TEST_RESOURCES_DIR ${WEBKIT2_EFL_TEST_DIR}/resources) ADD_DEFINITIONS(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\" + -DTEST_THEME_DIR=\"${THEME_BINARY_DIR}\" -DGTEST_LINKED_AS_SHARED_LIBRARY=1 ) |