Changeset 188643 in webkit


Ignore:
Timestamp:
Aug 19, 2015 11:37:02 AM (9 years ago)
Author:
commit-queue@webkit.org
Message:

Build TestWTF on Mac with CMake.
​https://bugs.webkit.org/show_bug.cgi?id=147972

Patch by Alex Christensen <​achristensen@webkit.org> on 2015-08-19
Reviewed by Tim Horton.

.:

  • Source/cmake/OptionsMac.cmake:

Enable API tests in Mac's CMake build.

Source/WebKit2:

  • PlatformMac.cmake:

Make more forwarding headers.

Tools:

TestWTF only depends on gtest and WTF instead of TestWebKitAPi depending on all of WebKit.
Now I can run the WTF API tests after a few seconds of building instead of waiting for all of WebKit to build.

  • TestWebKitAPI/CMakeLists.txt:

Added WTF as a dependency for platforms that do not have ForwardingHeadersForTestWebKitAPI_NAME.
WTF was already a library that was linked, but having at least one item makes the syntax of add_dependencies work.

  • TestWebKitAPI/PlatformMac.cmake: Added.
  • TestWebKitAPI/config.h:

Postpone some build fixes until WebKit builds completely on Mac with CMake.

Location:
trunk
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r188589 r188643  
     12015-08-19  Alex Christensen  <achristensen@webkit.org>
     2
     3        Build TestWTF on Mac with CMake.
     4        https://bugs.webkit.org/show_bug.cgi?id=147972
     5
     6        Reviewed by Tim Horton.
     7
     8        * Source/cmake/OptionsMac.cmake:
     9        Enable API tests in Mac's CMake build.
     10
    1112015-08-18  Alex Christensen  <achristensen@webkit.org>
    212

  • trunk/Source/WebKit2/ChangeLog

    r188642 r188643  
     12015-08-19  Alex Christensen  <achristensen@webkit.org>
     2
     3        Build TestWTF on Mac with CMake.
     4        https://bugs.webkit.org/show_bug.cgi?id=147972
     5
     6        Reviewed by Tim Horton.
     7
     8        * PlatformMac.cmake:
     9        Make more forwarding headers.
     10
    1112015-08-18  Filip Pizlo  <fpizlo@apple.com>
    212

  • trunk/Source/WebKit2/PlatformMac.cmake

    r188096 r188643  
    5959
    6060    UIProcess/API/C
     61    UIProcess/API/Cocoa
    6162
    6263    WebProcess/WebPage

  • trunk/Source/cmake/OptionsMac.cmake

    r187279 r188643  
    55WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphoneos PRIVATE ON)
    66WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphonesimulator PRIVATE ON)
     7WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
    78WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE ON)
    89WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS_macosx PRIVATE ON)

  • trunk/Tools/ChangeLog

    r188638 r188643  
     12015-08-19  Alex Christensen  <achristensen@webkit.org>
     2
     3        Build TestWTF on Mac with CMake.
     4        https://bugs.webkit.org/show_bug.cgi?id=147972
     5
     6        Reviewed by Tim Horton.
     7
     8        TestWTF only depends on gtest and WTF instead of TestWebKitAPi depending on all of WebKit.
     9        Now I can run the WTF API tests after a few seconds of building instead of waiting for all of WebKit to build.
     10
     11        * TestWebKitAPI/CMakeLists.txt:
     12        Added WTF as a dependency for platforms that do not have ForwardingHeadersForTestWebKitAPI_NAME.
     13        WTF was already a library that was linked, but having at least one item makes the syntax of add_dependencies work.
     14        * TestWebKitAPI/PlatformMac.cmake: Added.
     15        * TestWebKitAPI/config.h:
     16        Postpone some build fixes until WebKit builds completely on Mac with CMake.
     17
    1182015-08-19  Brian Burg  <bburg@apple.com>
    219

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r188558 r188643  
    142142
    143143    target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})
    144     add_dependencies(TestWebKitAPIInjectedBundle ${ForwardingHeadersForTestWebKitAPI_NAME})
     144    add_dependencies(TestWebKitAPIInjectedBundle WTF ${ForwardingHeadersForTestWebKitAPI_NAME})
    145145
    146146    get_property(TestWebKitAPIInjectedBundle_PATH TARGET TestWebKitAPIInjectedBundle PROPERTY LOCATION)

  • trunk/Tools/TestWebKitAPI/config.h

    r183697 r188643  
    8484
    8585#if PLATFORM(COCOA) && defined(__OBJC__)
     86// FIXME: Get Cocoa tests working with CMake on Mac.
     87#if !defined(BUILDING_WITH_CMAKE)
    8688#import <WebKit/WebKit.h>
     89#endif
    8790#endif
    8891
Note: See TracChangeset for help on using the changeset viewer.