https://bugs.webkit.org/show_bug.cgi?id=90602
Patch by Thiago Marcos P. Santos <thiago.santos@intel.com> 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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@121990
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
SET(CMAKE_BUILD_TYPE Release)
ENDIF ()
-# -----------------------------------------------------------------------------
-# Enable CTest for the public API unit testing
-# -----------------------------------------------------------------------------
-ENABLE_TESTING()
-
# -----------------------------------------------------------------------------
# Default library type
# -----------------------------------------------------------------------------
+2012-07-06 Thiago Marcos P. Santos <thiago.santos@intel.com>
+
+ [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 <zandobersek@gmail.com>
[Gtk] Add a configuration option for disabling unstable features in releases
ADD_SUBDIRECTORY(JavaScriptCore)
+IF (ENABLE_API_TESTS)
+ ADD_SUBDIRECTORY(cmake/gtest)
+ENDIF ()
+
IF (ENABLE_WEBCORE)
ADD_SUBDIRECTORY(WebCore)
ENDIF ()
+2012-07-06 Thiago Marcos P. Santos <thiago.santos@intel.com>
+
+ [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 <seokju.kwon@samsung.com>
[EFL] Add Web Inspector to WebKit-EFL
INSTALL(FILES ${WebKit_THEME}
DESTINATION ${DATA_INSTALL_DIR}/themes)
-INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest
- ${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
-)
+INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest/include)
SET(EWKUnitTests_LIBRARIES
${JavaScriptCore_LIBRARY_NAME}
ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
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
# -----------------------------------------------------------------------------
--- /dev/null
+# 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
+ ${JAVASCRIPTCORE_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
+)