Changeset 121990 in webkit


Ignore:
Timestamp:
Jul 6, 2012 12:19:44 PM (12 years ago)
Author:
commit-queue@webkit.org
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 <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:
Location:
trunk
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r121702 r121990  
    88    SET(CMAKE_BUILD_TYPE Release)
    99ENDIF ()
    10 
    11 # -----------------------------------------------------------------------------
    12 # Enable CTest for the public API unit testing
    13 # -----------------------------------------------------------------------------
    14 ENABLE_TESTING()
    1510
    1611# -----------------------------------------------------------------------------
  • trunk/ChangeLog

    r121988 r121990  
     12012-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
    1162012-07-06  Zan Dobersek  <zandobersek@gmail.com>
    217
  • trunk/Source/CMakeLists.txt

    r121893 r121990  
    55
    66ADD_SUBDIRECTORY(JavaScriptCore)
     7
     8IF (ENABLE_API_TESTS)
     9    ADD_SUBDIRECTORY(cmake/gtest)
     10ENDIF ()
    711
    812IF (ENABLE_WEBCORE)
  • trunk/Source/WebKit/ChangeLog

    r121947 r121990  
     12012-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
    1132012-07-06  Seokju Kwon  <seokju.kwon@samsung.com>
    214
  • trunk/Source/WebKit/PlatformEfl.cmake

    r121947 r121990  
    294294        DESTINATION ${DATA_INSTALL_DIR}/themes)
    295295
    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 )
     296INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest/include)
    311297
    312298SET(EWKUnitTests_LIBRARIES
  • trunk/Source/cmake/OptionsEfl.cmake

    r121897 r121990  
    1515ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
    1616SET(WTF_PLATFORM_EFL 1)
     17
     18# -----------------------------------------------------------------------------
     19# Enable CTest for the public API unit testing
     20# -----------------------------------------------------------------------------
     21ENABLE_TESTING()
     22SET(ENABLE_API_TESTS ON)
    1723
    1824# -----------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.