Source/WebKit/ChangeLog

 12012-07-05 Thiago Marcos P. Santos <thiago.santos@intel.com>
 2
 3 [EFL][CMake] Move gtest sources to an upper level
 4 https://bugs.webkit.org/show_bug.cgi?id=90602
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 Removed gtest since it is now built as a separated component.
 9 This will allow us to share it with WebKit 2 API tests.
 10
 11 * PlatformEfl.cmake:
 12
1132012-07-05 Kihong Kwon <kihong.kwon@samsung.com>
214
315 [EFL] Change class name from NotificationClientEfl to NotificationPresenterClientEfl.

Source/CMakeLists.txt

@@ADD_SUBDIRECTORY(WTF)
55
66ADD_SUBDIRECTORY(JavaScriptCore)
77
 8IF (ENABLE_API_TESTS)
 9 ADD_SUBDIRECTORY(cmake/gtest)
 10ENDIF ()
 11
812IF (ENABLE_WEBCORE)
913 ADD_SUBDIRECTORY(WebCore)
1014ENDIF ()

Source/WebKit/PlatformEfl.cmake

@@INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest
297297 ${THIRDPARTY_DIR}/gtest/include
298298)
299299
300 SET(GTEST_SOURCES "${THIRDPARTY_DIR}/gtest/src")
301 
302 ADD_LIBRARY(gtest
303  ${GTEST_SOURCES}/gtest.cc
304  ${GTEST_SOURCES}/gtest-death-test.cc
305  ${GTEST_SOURCES}/gtest_main.cc
306  ${GTEST_SOURCES}/gtest-filepath.cc
307  ${GTEST_SOURCES}/gtest-port.cc
308  ${GTEST_SOURCES}/gtest-test-part.cc
309  ${GTEST_SOURCES}/gtest-typed-test.cc
310 )
311 
312300SET(EWKUnitTests_LIBRARIES
313301 ${JavaScriptCore_LIBRARY_NAME}
314302 ${WebCore_LIBRARY_NAME}

Source/cmake/OptionsEfl.cmake

@@ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
1616SET(WTF_PLATFORM_EFL 1)
1717
1818# -----------------------------------------------------------------------------
 19# Enable CTest for the public API unit testing
 20# -----------------------------------------------------------------------------
 21ENABLE_TESTING()
 22SET(ENABLE_API_TESTS ON)
 23
 24# -----------------------------------------------------------------------------
1925# Determine which font backend will be used
2026# -----------------------------------------------------------------------------
2127SET(ALL_FONT_BACKENDS freetype pango)

Source/cmake/gtest/CMakeLists.txt

 1# This is an alternative CMakeLists.txt to the experimental one
 2# shipped with the original package. It builds only the essential
 3# for our tests. The WebKit version of gtest needs access to some
 4# headers from WTF and JSC for configuration.
 5
 6INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest
 7 ${THIRDPARTY_DIR}/gtest/include
 8 ${JAVASCRIPTCORE_DIR}
 9 ${WTF_DIR}
 10)
 11
 12SET(GTEST_SOURCES "${THIRDPARTY_DIR}/gtest/src")
 13
 14ADD_LIBRARY(gtest
 15 ${GTEST_SOURCES}/gtest.cc
 16 ${GTEST_SOURCES}/gtest-death-test.cc
 17 ${GTEST_SOURCES}/gtest_main.cc
 18 ${GTEST_SOURCES}/gtest-filepath.cc
 19 ${GTEST_SOURCES}/gtest-port.cc
 20 ${GTEST_SOURCES}/gtest-test-part.cc
 21 ${GTEST_SOURCES}/gtest-typed-test.cc
 22)

CMakeLists.txt

@@IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)
99ENDIF ()
1010
1111# -----------------------------------------------------------------------------
12 # Enable CTest for the public API unit testing
13 # -----------------------------------------------------------------------------
14 ENABLE_TESTING()
15 
16 # -----------------------------------------------------------------------------
1712# Default library type
1813# -----------------------------------------------------------------------------
1914SET(ENABLE_WEBCORE ON)

ChangeLog

 12012-07-05 Thiago Marcos P. Santos <thiago.santos@intel.com>
 2
 3 [EFL][CMake] Move gtest sources to an upper level
 4 https://bugs.webkit.org/show_bug.cgi?id=90602
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 CTest was enabled for all the ports, but used only by EFL. Now
 9 ENABLE_API_TESTS has to be defined, which will also build gtest.
 10
 11 * CMakeLists.txt:
 12 * Source/CMakeLists.txt:
 13 * Source/cmake/OptionsEfl.cmake:
 14 * Source/cmake/gtest/CMakeLists.txt: Added.
 15
1162012-07-05 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
217
318 [Qt] Move Webkit1 before WebKit2 in the build order