diff options
Diffstat (limited to 'Source/WebKit/PlatformEfl.cmake')
| -rw-r--r-- | Source/WebKit/PlatformEfl.cmake | 56 |
1 files changed, 30 insertions, 26 deletions
diff --git a/Source/WebKit/PlatformEfl.cmake b/Source/WebKit/PlatformEfl.cmake index f6800af57..c6243da30 100644 --- a/Source/WebKit/PlatformEfl.cmake +++ b/Source/WebKit/PlatformEfl.cmake @@ -75,9 +75,6 @@ IF (ENABLE_NETWORK_INFO) "${WEBCORE_DIR}/Modules/networkinfo" ${EEZE_INCLUDE_DIRS} ) - LIST(APPEND WebKit_SOURCES - efl/WebCoreSupport/NetworkInfoClientEfl.cpp - ) LIST(APPEND WebKit_LIBRARIES ${EEZE_LIBRARIES} ) @@ -89,6 +86,24 @@ IF (ENABLE_NOTIFICATIONS) ) ENDIF () +IF (ENABLE_VIBRATION) + LIST(APPEND WebKit_INCLUDE_DIRECTORIES + "${WEBCORE_DIR}/Modules/vibration" + ) +ENDIF () + +IF (ENABLE_BATTERY_STATUS) + LIST(APPEND WebKit_INCLUDE_DIRECTORIES + "${WEBCORE_DIR}/Modules/battery" + ) +ENDIF () + +IF (ENABLE_REGISTER_PROTOCOL_HANDLER OR ENABLE_CUSTOM_SCHEME_HANDLER) + LIST(APPEND WebKit_INCLUDE_DIRECTORIES + "${WEBCORE_DIR}/Modules/protocolhandler" + ) +ENDIF () + LIST(APPEND WebKit_SOURCES efl/WebCoreSupport/AssertMatchingEnums.cpp efl/WebCoreSupport/BatteryClientEfl.cpp @@ -102,16 +117,20 @@ LIST(APPEND WebKit_SOURCES efl/WebCoreSupport/FrameNetworkingContextEfl.cpp efl/WebCoreSupport/FullscreenVideoControllerEfl.cpp efl/WebCoreSupport/IconDatabaseClientEfl.cpp - efl/WebCoreSupport/StorageTrackerClientEfl.cpp efl/WebCoreSupport/InspectorClientEfl.cpp + efl/WebCoreSupport/NetworkInfoClientEfl.cpp efl/WebCoreSupport/NotificationPresenterClientEfl.cpp efl/WebCoreSupport/PageClientEfl.cpp efl/WebCoreSupport/PlatformStrategiesEfl.cpp + efl/WebCoreSupport/RegisterProtocolHandlerClientEfl.cpp + efl/WebCoreSupport/StorageTrackerClientEfl.cpp + efl/WebCoreSupport/VibrationClientEfl.cpp efl/ewk/ewk_auth.cpp efl/ewk/ewk_auth_soup.cpp efl/ewk/ewk_contextmenu.cpp efl/ewk/ewk_cookies.cpp + efl/ewk/ewk_custom_handler.cpp efl/ewk/ewk_frame.cpp efl/ewk/ewk_history.cpp efl/ewk/ewk_intent.cpp @@ -151,25 +170,6 @@ LIST(APPEND WebKit_LIBRARIES ${LIBSOUP24_LIBRARIES} ) -IF (ENABLE_VIBRATION) - LIST(APPEND WebKit_INCLUDE_DIRECTORIES - ${WEBCORE_DIR}/Modules/vibration - ) - LIST(APPEND WebKit_SOURCES - efl/WebCoreSupport/VibrationClientEfl.cpp - ) -ENDIF () - -IF (ENABLE_BATTERY_STATUS) - LIST(APPEND WebKit_INCLUDE_DIRECTORIES ${WEBCORE_DIR}/Modules/battery) -ENDIF () - -IF (ENABLE_REGISTER_PROTOCOL_HANDLER) - LIST(APPEND WebKit_SOURCES - efl/ewk/ewk_custom_handler.cpp - ) -ENDIF () - SET(WebKit_THEME_DEFINITION "") IF (ENABLE_PROGRESS_TAG) LIST(APPEND WebKit_THEME_DEFINITION "-DENABLE_PROGRESS_TAG") @@ -297,6 +297,7 @@ INSTALL(FILES ${WebKit_THEME} INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest/include) SET(EWKUnitTests_LIBRARIES + ${WTF_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_NAME} ${WebCore_LIBRARY_NAME} ${WebKit_LIBRARY_NAME} @@ -304,6 +305,7 @@ SET(EWKUnitTests_LIBRARIES ${ECORE_EVAS_LIBRARIES} ${EVAS_LIBRARIES} ${EDJE_LIBRARIES} + gtest ) SET(EWKUnitTests_INCLUDE_DIRECTORIES @@ -335,8 +337,10 @@ ENDIF () SET(DEFAULT_TEST_PAGE_DIR ${CMAKE_SOURCE_DIR}/Source/WebKit/efl/tests/resources) -ADD_DEFINITIONS(-DDEFAULT_TEST_PAGE_DIR=\"${DEFAULT_TEST_PAGE_DIR}\") -ADD_DEFINITIONS(-DDEFAULT_THEME_PATH=\"${THEME_BINARY_DIR}\") +ADD_DEFINITIONS(-DDEFAULT_TEST_PAGE_DIR=\"${DEFAULT_TEST_PAGE_DIR}\" + -DDEFAULT_THEME_PATH=\"${THEME_BINARY_DIR}\" + -DGTEST_LINKED_AS_SHARED_LIBRARY=1 +) ADD_LIBRARY(ewkTestUtils ${WEBKIT_DIR}/efl/tests/UnitTestUtils/EWKTestBase.cpp @@ -354,7 +358,7 @@ IF (ENABLE_API_TESTS) FOREACH (testName ${EWKUnitTests_BINARIES}) ADD_EXECUTABLE(${testName} ${WEBKIT_EFL_TEST_DIR}/${testName}.cpp ${WEBKIT_EFL_TEST_DIR}/test_runner.cpp) ADD_TEST(${testName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testName}) - TARGET_LINK_LIBRARIES(${testName} ${EWKUnitTests_LIBRARIES} ewkTestUtils gtest pthread) + TARGET_LINK_LIBRARIES(${testName} ${EWKUnitTests_LIBRARIES} ewkTestUtils) ADD_TARGET_PROPERTIES(${testName} LINK_FLAGS "${EWKUnitTests_LINK_FLAGS}") SET_TARGET_PROPERTIES(${testName} PROPERTIES FOLDER "WebKit") ENDFOREACH () |