Changeset 201877 in webkit


Ignore:
Timestamp:
Jun 9, 2016 11:52:27 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r201815.
​https://bugs.webkit.org/show_bug.cgi?id=158570

This broke the cmake build. (Requested by lforschler on
#webkit).

Reverted changeset:

"Teach cmake about libWebKitSystemInterfaceOSX10.12"
​http://trac.webkit.org/changeset/201815

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r201876 r201877  
     12016-06-09  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r201815.
     4        https://bugs.webkit.org/show_bug.cgi?id=158570
     5
     6        This broke the cmake build. (Requested by lforschler on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "Teach cmake about libWebKitSystemInterfaceOSX10.12"
     12        http://trac.webkit.org/changeset/201815
     13
    1142016-06-09  Chris Dumez  <cdumez@apple.com>
    215

  • trunk/Source/WebCore/PlatformMac.cmake

    r201815 r201877  
    55elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
    66set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
    7 elif ("${CURRENT_OSX_VERSION}" MATCHES "10.11")
     7else ()
    88set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
    9 else ()
    10 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
    119endif ()
    1210link_directories(../../WebKitLibraries)

  • trunk/Tools/ChangeLog

    r201872 r201877  
     12016-06-09  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r201815.
     4        https://bugs.webkit.org/show_bug.cgi?id=158570
     5
     6        This broke the cmake build. (Requested by lforschler on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "Teach cmake about libWebKitSystemInterfaceOSX10.12"
     12        http://trac.webkit.org/changeset/201815
     13
    1142016-06-09  Brady Eidson  <beidson@apple.com>
    215

  • trunk/Tools/DumpRenderTree/PlatformMac.cmake

    r201815 r201877  
    88elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
    99set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
    10 elif ("${CURRENT_OSX_VERSION}" MATCHES "10.11")
     10else ()
    1111set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
    12 else ()
    13 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
    1412endif ()
    1513link_directories(../../WebKitLibraries)
    … …  
    2927add_definitions("-ObjC++ -std=c++11")
    3028
     29if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
     30set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
     31elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
     32set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
     33else ()
     34set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
     35endif ()
    3136link_directories(../../WebKitLibraries)
    3237include_directories(../../WebKitLibraries)

  • trunk/Tools/WebKitTestRunner/PlatformMac.cmake

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