Changeset 121990 in webkit
- Timestamp:
- Jul 6, 2012 12:19:44 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r121702 r121990 8 8 SET(CMAKE_BUILD_TYPE Release) 9 9 ENDIF () 10 11 # -----------------------------------------------------------------------------12 # Enable CTest for the public API unit testing13 # -----------------------------------------------------------------------------14 ENABLE_TESTING()15 10 16 11 # ----------------------------------------------------------------------------- -
trunk/ChangeLog
r121988 r121990 1 2012-07-06 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 Chang Shu. 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 1 16 2012-07-06 Zan Dobersek <zandobersek@gmail.com> 2 17 -
trunk/Source/CMakeLists.txt
r121893 r121990 5 5 6 6 ADD_SUBDIRECTORY(JavaScriptCore) 7 8 IF (ENABLE_API_TESTS) 9 ADD_SUBDIRECTORY(cmake/gtest) 10 ENDIF () 7 11 8 12 IF (ENABLE_WEBCORE) -
trunk/Source/WebKit/ChangeLog
r121947 r121990 1 2012-07-06 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 Chang Shu. 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 1 13 2012-07-06 Seokju Kwon <seokju.kwon@samsung.com> 2 14 -
trunk/Source/WebKit/PlatformEfl.cmake
r121947 r121990 294 294 DESTINATION ${DATA_INSTALL_DIR}/themes) 295 295 296 INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest 297 ${THIRDPARTY_DIR}/gtest/include 298 ) 299 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 ) 296 INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest/include) 311 297 312 298 SET(EWKUnitTests_LIBRARIES -
trunk/Source/cmake/OptionsEfl.cmake
r121897 r121990 15 15 ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1) 16 16 SET(WTF_PLATFORM_EFL 1) 17 18 # ----------------------------------------------------------------------------- 19 # Enable CTest for the public API unit testing 20 # ----------------------------------------------------------------------------- 21 ENABLE_TESTING() 22 SET(ENABLE_API_TESTS ON) 17 23 18 24 # -----------------------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.