Title: [201877] trunk
- Revision
- 201877
- Author
- [email protected]
- Date
- 2016-06-09 11:52:27 -0700 (Thu, 09 Jun 2016)
Log 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
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201876 => 201877)
--- trunk/Source/WebCore/ChangeLog 2016-06-09 18:47:21 UTC (rev 201876)
+++ trunk/Source/WebCore/ChangeLog 2016-06-09 18:52:27 UTC (rev 201877)
@@ -1,3 +1,16 @@
+2016-06-09 Commit Queue <[email protected]>
+
+ 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
+
2016-06-09 Chris Dumez <[email protected]>
WorkerGlobalScope attributes / operations should be on the prototype
Modified: trunk/Source/WebCore/PlatformMac.cmake (201876 => 201877)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-06-09 18:47:21 UTC (rev 201876)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-06-09 18:52:27 UTC (rev 201877)
@@ -4,10 +4,8 @@
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
-elif ("${CURRENT_OSX_VERSION}" MATCHES "10.11")
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
else ()
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
endif ()
link_directories(../../WebKitLibraries)
Modified: trunk/Tools/ChangeLog (201876 => 201877)
--- trunk/Tools/ChangeLog 2016-06-09 18:47:21 UTC (rev 201876)
+++ trunk/Tools/ChangeLog 2016-06-09 18:52:27 UTC (rev 201877)
@@ -1,3 +1,16 @@
+2016-06-09 Commit Queue <[email protected]>
+
+ 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
+
2016-06-09 Brady Eidson <[email protected]>
Greatly simplify CrossThreadTask.h.
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (201876 => 201877)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-06-09 18:47:21 UTC (rev 201876)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-06-09 18:52:27 UTC (rev 201877)
@@ -7,10 +7,8 @@
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
-elif ("${CURRENT_OSX_VERSION}" MATCHES "10.11")
+else ()
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
-else ()
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
endif ()
link_directories(../../WebKitLibraries)
@@ -28,6 +26,13 @@
add_definitions("-ObjC++ -std=c++11")
+if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
+elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
+else ()
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
+endif ()
link_directories(../../WebKitLibraries)
include_directories(../../WebKitLibraries)
Modified: trunk/Tools/WebKitTestRunner/PlatformMac.cmake (201876 => 201877)
--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2016-06-09 18:47:21 UTC (rev 201876)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2016-06-09 18:52:27 UTC (rev 201877)
@@ -7,10 +7,8 @@
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
-elif ("${CURRENT_OSX_VERSION}" MATCHES "10.11")
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
else ()
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
endif ()
link_directories(../../WebKitLibraries)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
