Title: [201815] trunk
- Revision
- 201815
- Author
- lforsch...@apple.com
- Date
- 2016-06-08 11:37:13 -0700 (Wed, 08 Jun 2016)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201814 => 201815)
--- trunk/Source/WebCore/ChangeLog 2016-06-08 18:25:39 UTC (rev 201814)
+++ trunk/Source/WebCore/ChangeLog 2016-06-08 18:37:13 UTC (rev 201815)
@@ -1,3 +1,11 @@
+2016-06-08 Lucas Forschler <lforsch...@apple.com>
+
+ Teach cmake about libWebKitSystemInterfaceOSX10.12
+
+ Rubber-stamped by Matt Hanson and Alex Christensen.
+
+ * PlatformMac.cmake:
+
2016-06-08 Rawinder Singh <rawinder.singh-web...@cisra.canon.com.au>
[web-animations] Add Animatable, AnimationEffect, KeyframeEffect and Animation interface
Modified: trunk/Source/WebCore/PlatformMac.cmake (201814 => 201815)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-06-08 18:25:39 UTC (rev 201814)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-06-08 18:37:13 UTC (rev 201815)
@@ -4,8 +4,10 @@
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 libWebKitSystemInterfaceElCapitan.a)
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
endif ()
link_directories(../../WebKitLibraries)
Modified: trunk/Tools/ChangeLog (201814 => 201815)
--- trunk/Tools/ChangeLog 2016-06-08 18:25:39 UTC (rev 201814)
+++ trunk/Tools/ChangeLog 2016-06-08 18:37:13 UTC (rev 201815)
@@ -1,3 +1,13 @@
+2016-06-08 Lucas Forschler <lforsch...@apple.com>
+
+ Teach cmake about libWebKitSystemInterfaceOSX10.12
+ This patch also removes duplicated logic inside DumpRenderTree/PlatformMac.cmake
+
+ Rubber-stamped by Alex Christensen.
+
+ * DumpRenderTree/PlatformMac.cmake:
+ * WebKitTestRunner/PlatformMac.cmake:
+
2016-06-07 Lucas Forschler <lforsch...@apple.com>
<rdar://problem/26685782>
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (201814 => 201815)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-06-08 18:25:39 UTC (rev 201814)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-06-08 18:37:13 UTC (rev 201815)
@@ -7,8 +7,10 @@
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
-else ()
+elif ("${CURRENT_OSX_VERSION}" MATCHES "10.11")
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
+else ()
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
endif ()
link_directories(../../WebKitLibraries)
@@ -26,13 +28,6 @@
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 (201814 => 201815)
--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2016-06-08 18:25:39 UTC (rev 201814)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2016-06-08 18:37:13 UTC (rev 201815)
@@ -7,8 +7,10 @@
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 libWebKitSystemInterfaceElCapitan.a)
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceOSX10.12.a)
endif ()
link_directories(../../WebKitLibraries)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
