Title: [121990] trunk
- Revision
- 121990
- Author
- [email protected]
- Date
- 2012-07-06 12:19:44 -0700 (Fri, 06 Jul 2012)
Log Message
[EFL][CMake] Move gtest sources to an upper level
https://bugs.webkit.org/show_bug.cgi?id=90602
Patch by Thiago Marcos P. Santos <[email protected]> on 2012-07-06
Reviewed by Chang Shu.
.:
CTest was enabled for all the ports, but used only by EFL. Now
ENABLE_API_TESTS has to be defined, which will also build gtest.
* CMakeLists.txt:
* Source/CMakeLists.txt:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/gtest/CMakeLists.txt: Added.
Source/WebKit:
Removed gtest since it is now built as a separated component.
This will allow us to share it with WebKit 2 API tests.
* PlatformEfl.cmake:
Modified Paths
Added Paths
Diff
Modified: trunk/CMakeLists.txt (121989 => 121990)
--- trunk/CMakeLists.txt 2012-07-06 19:12:12 UTC (rev 121989)
+++ trunk/CMakeLists.txt 2012-07-06 19:19:44 UTC (rev 121990)
@@ -9,11 +9,6 @@
ENDIF ()
# -----------------------------------------------------------------------------
-# Enable CTest for the public API unit testing
-# -----------------------------------------------------------------------------
-ENABLE_TESTING()
-
-# -----------------------------------------------------------------------------
# Default library type
# -----------------------------------------------------------------------------
SET(ENABLE_WEBCORE ON)
Modified: trunk/ChangeLog (121989 => 121990)
--- trunk/ChangeLog 2012-07-06 19:12:12 UTC (rev 121989)
+++ trunk/ChangeLog 2012-07-06 19:19:44 UTC (rev 121990)
@@ -1,3 +1,18 @@
+2012-07-06 Thiago Marcos P. Santos <[email protected]>
+
+ [EFL][CMake] Move gtest sources to an upper level
+ https://bugs.webkit.org/show_bug.cgi?id=90602
+
+ Reviewed by Chang Shu.
+
+ CTest was enabled for all the ports, but used only by EFL. Now
+ ENABLE_API_TESTS has to be defined, which will also build gtest.
+
+ * CMakeLists.txt:
+ * Source/CMakeLists.txt:
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/gtest/CMakeLists.txt: Added.
+
2012-07-06 Zan Dobersek <[email protected]>
[Gtk] Add a configuration option for disabling unstable features in releases
Modified: trunk/Source/CMakeLists.txt (121989 => 121990)
--- trunk/Source/CMakeLists.txt 2012-07-06 19:12:12 UTC (rev 121989)
+++ trunk/Source/CMakeLists.txt 2012-07-06 19:19:44 UTC (rev 121990)
@@ -5,6 +5,10 @@
ADD_SUBDIRECTORY(_javascript_Core)
+IF (ENABLE_API_TESTS)
+ ADD_SUBDIRECTORY(cmake/gtest)
+ENDIF ()
+
IF (ENABLE_WEBCORE)
ADD_SUBDIRECTORY(WebCore)
ENDIF ()
Modified: trunk/Source/WebKit/ChangeLog (121989 => 121990)
--- trunk/Source/WebKit/ChangeLog 2012-07-06 19:12:12 UTC (rev 121989)
+++ trunk/Source/WebKit/ChangeLog 2012-07-06 19:19:44 UTC (rev 121990)
@@ -1,3 +1,15 @@
+2012-07-06 Thiago Marcos P. Santos <[email protected]>
+
+ [EFL][CMake] Move gtest sources to an upper level
+ https://bugs.webkit.org/show_bug.cgi?id=90602
+
+ Reviewed by Chang Shu.
+
+ Removed gtest since it is now built as a separated component.
+ This will allow us to share it with WebKit 2 API tests.
+
+ * PlatformEfl.cmake:
+
2012-07-06 Seokju Kwon <[email protected]>
[EFL] Add Web Inspector to WebKit-EFL
Modified: trunk/Source/WebKit/PlatformEfl.cmake (121989 => 121990)
--- trunk/Source/WebKit/PlatformEfl.cmake 2012-07-06 19:12:12 UTC (rev 121989)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2012-07-06 19:19:44 UTC (rev 121990)
@@ -293,22 +293,8 @@
INSTALL(FILES ${WebKit_THEME}
DESTINATION ${DATA_INSTALL_DIR}/themes)
-INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest
- ${THIRDPARTY_DIR}/gtest/include
-)
+INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest/include)
-SET(GTEST_SOURCES "${THIRDPARTY_DIR}/gtest/src")
-
-ADD_LIBRARY(gtest
- ${GTEST_SOURCES}/gtest.cc
- ${GTEST_SOURCES}/gtest-death-test.cc
- ${GTEST_SOURCES}/gtest_main.cc
- ${GTEST_SOURCES}/gtest-filepath.cc
- ${GTEST_SOURCES}/gtest-port.cc
- ${GTEST_SOURCES}/gtest-test-part.cc
- ${GTEST_SOURCES}/gtest-typed-test.cc
-)
-
SET(EWKUnitTests_LIBRARIES
${_javascript_Core_LIBRARY_NAME}
${WebCore_LIBRARY_NAME}
Modified: trunk/Source/cmake/OptionsEfl.cmake (121989 => 121990)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-07-06 19:12:12 UTC (rev 121989)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-07-06 19:19:44 UTC (rev 121990)
@@ -16,6 +16,12 @@
SET(WTF_PLATFORM_EFL 1)
# -----------------------------------------------------------------------------
+# Enable CTest for the public API unit testing
+# -----------------------------------------------------------------------------
+ENABLE_TESTING()
+SET(ENABLE_API_TESTS ON)
+
+# -----------------------------------------------------------------------------
# Determine which font backend will be used
# -----------------------------------------------------------------------------
SET(ALL_FONT_BACKENDS freetype pango)
Added: trunk/Source/cmake/gtest/CMakeLists.txt (0 => 121990)
--- trunk/Source/cmake/gtest/CMakeLists.txt (rev 0)
+++ trunk/Source/cmake/gtest/CMakeLists.txt 2012-07-06 19:19:44 UTC (rev 121990)
@@ -0,0 +1,22 @@
+# This is an alternative CMakeLists.txt to the experimental one
+# shipped with the original package. It builds only the essential
+# for our tests. The WebKit version of gtest needs access to some
+# headers from WTF and JSC for configuration.
+
+INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest
+ ${THIRDPARTY_DIR}/gtest/include
+ ${_javascript_CORE_DIR}
+ ${WTF_DIR}
+)
+
+SET(GTEST_DIR "${THIRDPARTY_DIR}/gtest")
+
+ADD_LIBRARY(gtest
+ ${GTEST_DIR}/src/gtest.cc
+ ${GTEST_DIR}/src/gtest-death-test.cc
+ ${GTEST_DIR}/src/gtest-filepath.cc
+ ${GTEST_DIR}/src/gtest_main.cc
+ ${GTEST_DIR}/src/gtest-port.cc
+ ${GTEST_DIR}/src/gtest-test-part.cc
+ ${GTEST_DIR}/src/gtest-typed-test.cc
+)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
