Changeset 201815 in webkit


Ignore:
Timestamp:
Jun 8, 2016 11:37:13 AM (8 years ago)
Author:
Lucas Forschler
Message:

Teach cmake about libWebKitSystemInterfaceOSX10.12
Source/WebCore:


Rubber-stamped by Matt Hanson and Alex Christensen.

  • PlatformMac.cmake:

Tools:

This patch also removes duplicated logic inside DumpRenderTree/PlatformMac.cmake

Rubber-stamped by Alex Christensen.

  • DumpRenderTree/PlatformMac.cmake:
  • WebKitTestRunner/PlatformMac.cmake:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r201810 r201815  
     12016-06-08  Lucas Forschler  <lforschler@apple.com>
     2
     3        Teach cmake about libWebKitSystemInterfaceOSX10.12
     4       
     5        Rubber-stamped by Matt Hanson and Alex Christensen.
     6       
     7        * PlatformMac.cmake:
     8
    192016-06-08  Rawinder Singh  <rawinder.singh-webkit@cisra.canon.com.au>
    210

  • trunk/Source/WebCore/PlatformMac.cmake

    r201398 r201815  
    55elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
    66set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
     7elif ("${CURRENT_OSX_VERSION}" MATCHES "10.11")
     8set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
    79else ()
    8 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
     10set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
    911endif ()
    1012link_directories(../../WebKitLibraries)

  • trunk/Tools/ChangeLog

    r201814 r201815  
     12016-06-08  Lucas Forschler  <lforschler@apple.com>
     2
     3        Teach cmake about libWebKitSystemInterfaceOSX10.12
     4        This patch also removes duplicated logic inside DumpRenderTree/PlatformMac.cmake
     5
     6        Rubber-stamped by Alex Christensen.
     7 
     8        * DumpRenderTree/PlatformMac.cmake:
     9        * WebKitTestRunner/PlatformMac.cmake:
     10
    1112016-06-07  Lucas Forschler  <lforschler@apple.com>
    212

  • trunk/Tools/DumpRenderTree/PlatformMac.cmake

    r199094 r201815  
    88elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
    99set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
     10elif ("${CURRENT_OSX_VERSION}" MATCHES "10.11")
     11set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
    1012else ()
    11 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
     13set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
    1214endif ()
    1315link_directories(../../WebKitLibraries)
    … …  
    2729add_definitions("-ObjC++ -std=c++11")
    2830
    29 if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
    30 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
    31 elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
    32 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
    33 else ()
    34 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
    35 endif ()
    3631link_directories(../../WebKitLibraries)
    3732include_directories(../../WebKitLibraries)

  • trunk/Tools/WebKitTestRunner/PlatformMac.cmake

    r199118 r201815  
    88elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
    99set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
     10elif ("${CURRENT_OSX_VERSION}" MATCHES "10.11")
     11set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
    1012else ()
    11 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
     13set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
    1214endif ()
    1315link_directories(../../WebKitLibraries)
Note: See TracChangeset for help on using the changeset viewer.