Changeset 154071 in webkit


Ignore:
Timestamp:
Aug 14, 2013 2:00:39 PM (11 years ago)
Author:
Martin Robinson
Message:

[GTK] [CMake] Add support for building TestWebKitAPI
https://bugs.webkit.org/show_bug.cgi?id=116987

Reviewed by Philippe Normand.

.:

  • Source/cmake/OptionsGTK.cmake: Turn on the API tests in the settings.

Tools:

  • TestWebKitAPI/CMakeLists.txt: Move the library listings to before the inclusion of the

platform-specific file, so that GTK+ can override them.

  • TestWebKitAPI/PlatformGTK.cmake: Added.
Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r154008 r154071  
     12013-08-14  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add support for building TestWebKitAPI
     4        https://bugs.webkit.org/show_bug.cgi?id=116987
     5
     6        Reviewed by Philippe Normand.
     7
     8        * Source/cmake/OptionsGTK.cmake: Turn on the API tests in the settings.
     9
    1102013-08-13  Zan Dobersek  <zdobersek@igalia.com>
    211
  • trunk/Source/cmake/OptionsGTK.cmake

    r153772 r154071  
    55WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
    66WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
    7 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF)
     7WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
    88WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS OFF)
    99WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BLOB ON)
  • trunk/Tools/ChangeLog

    r154070 r154071  
     12013-08-14  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add support for building TestWebKitAPI
     4        https://bugs.webkit.org/show_bug.cgi?id=116987
     5
     6        Reviewed by Philippe Normand.
     7
     8        * TestWebKitAPI/CMakeLists.txt: Move the library listings to before the inclusion of the
     9        platform-specific file, so that GTK+ can override them.
     10        * TestWebKitAPI/PlatformGTK.cmake: Added.
     11
    1122013-08-14  Brent Fulgham  <bfulgham@apple.com>
    213
  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r152774 r154071  
    2222    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
    2323    ${WTF_DIR}
     24)
     25
     26set(test_wtf_LIBRARIES
     27    WTF
     28    gtest
     29)
     30
     31set(test_webcore_LIBRARIES
     32    gtest
     33    WTF
     34    WebCore
     35)
     36
     37set(test_webkit2_api_LIBRARIES
     38    TestWebKitAPIBase
     39    WTF
     40    JavaScriptCore
     41    WebKit2
     42    gtest
    2443)
    2544
     
    7190)
    7291
    73 set(test_wtf_LIBRARIES
    74     WTF
    75     gtest
    76 )
    77 
    7892add_executable(test_wtf
    7993    ${test_main_SOURCES}
     
    108122set_tests_properties(test_wtf PROPERTIES TIMEOUT 60)
    109123
    110 set(test_webcore_LIBRARIES
    111     gtest
    112     WTF
    113     WebCore
    114 )
    115 
    116124foreach (testName ${test_webcore_BINARIES})
    117125    add_executable(test_webcore_${testName} ${test_main_SOURCES} ${TESTWEBKITAPI_DIR}/TestsController.cpp ${TESTWEBKITAPI_DIR}/Tests/WebCore/${testName}.cpp)
     
    131139add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
    132140
    133 set(test_webkit2_api_LIBRARIES
    134     TestWebKitAPIBase
    135     WTF
    136     JavaScriptCore
    137     WebKit2
    138     gtest
    139 )
    140 
    141141foreach (testName ${test_webkit2_api_BINARIES})
    142142    get_filename_component(testBaseName ${testName} NAME)
Note: See TracChangeset for help on using the changeset viewer.