Title: [204735] trunk/Source
- Revision
- 204735
- Author
- achristen...@apple.com
- Date
- 2016-08-22 13:13:36 -0700 (Mon, 22 Aug 2016)
Log Message
Fix Mac CMake build after r204717.
* PlatformMac.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (204734 => 204735)
--- trunk/Source/WebCore/ChangeLog 2016-08-22 20:11:16 UTC (rev 204734)
+++ trunk/Source/WebCore/ChangeLog 2016-08-22 20:13:36 UTC (rev 204735)
@@ -1,3 +1,9 @@
+2016-08-22 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build after r204717.
+
+ * PlatformMac.cmake:
+
2016-08-22 Javier Fernandez <jfernan...@igalia.com>
[css-grid] Stretch alignment doesn't work for orthogonal flows
Modified: trunk/Source/WebCore/PlatformMac.cmake (204734 => 204735)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-08-22 20:11:16 UTC (rev 204734)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-08-22 20:13:36 UTC (rev 204735)
@@ -168,6 +168,7 @@
bindings/js/ScriptControllerMac.mm
bridge/objc/ObjCRuntimeObject.mm
+ bridge/objc/WebScriptObject.mm
bridge/objc/objc_class.mm
bridge/objc/objc_instance.mm
bridge/objc/objc_runtime.mm
@@ -598,8 +599,8 @@
bindings/generic
bindings/js
- bindings/objc
+ bridge/objc
bridge/jsc
editing/cocoa
@@ -663,6 +664,8 @@
svg/graphics
svg/properties
+
+ xml
)
set(WebCore_FORWARDING_HEADERS_FILES
Modified: trunk/Source/WebKit/ChangeLog (204734 => 204735)
--- trunk/Source/WebKit/ChangeLog 2016-08-22 20:11:16 UTC (rev 204734)
+++ trunk/Source/WebKit/ChangeLog 2016-08-22 20:13:36 UTC (rev 204735)
@@ -1,5 +1,11 @@
2016-08-22 Alex Christensen <achristen...@webkit.org>
+ Fix Mac CMake build after r204717.
+
+ * PlatformMac.cmake:
+
+2016-08-22 Alex Christensen <achristen...@webkit.org>
+
Mostly fix Mac CMake build after r204717.
* PlatformMac.cmake:
Modified: trunk/Source/WebKit/PlatformMac.cmake (204734 => 204735)
--- trunk/Source/WebKit/PlatformMac.cmake 2016-08-22 20:11:16 UTC (rev 204734)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-08-22 20:13:36 UTC (rev 204735)
@@ -481,6 +481,10 @@
# FIXME: Forwarding headers should be copies of actual headers.
file(GLOB ObjCHeaders ${WEBCORE_DIR}/plugins/*.h)
+list(APPEND ObjCHeaders
+ WebKitAvailiability.h
+ WebScriptObject.h
+)
foreach (_file ${ObjCHeaders})
get_filename_component(_name ${_file} NAME)
if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name})
@@ -490,18 +494,4 @@
set(WebKit_OUTPUT_NAME WebKitLegacy)
-set(WebKitLegacy_WebCore_FORWARDING_HEADERS
- DOMElement.h
- DOMHTMLFormElement.h
- DOMHTMLInputElement.h
- DOMWheelEvent.h
-)
-
-# FIXME: These shouldn't be necessary, but it doesn't compile without them.
-foreach (_file ${WebKitLegacy_WebCore_FORWARDING_HEADERS})
- if (NOT EXISTS ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/${_file})
- file(WRITE ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/${_file} "#import <WebCore/${_file}>")
- endif ()
-endforeach ()
-
set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
Modified: trunk/Source/WebKit2/ChangeLog (204734 => 204735)
--- trunk/Source/WebKit2/ChangeLog 2016-08-22 20:11:16 UTC (rev 204734)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-22 20:13:36 UTC (rev 204735)
@@ -1,3 +1,9 @@
+2016-08-22 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build after r204717.
+
+ * PlatformMac.cmake:
+
2016-08-22 Simon Fraser <simon.fra...@apple.com>
<select> menu on iPad causes shifting of hit-testing areas
Modified: trunk/Source/WebKit2/PlatformMac.cmake (204734 => 204735)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-08-22 20:11:16 UTC (rev 204734)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-08-22 20:13:36 UTC (rev 204735)
@@ -581,7 +581,7 @@
file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
endforeach ()
-set(WebCoreForwardingHeaders
+set(ObjCForwardingHeaders
DOMAbstractView.h
DOMAttr.h
DOMBeforeLoadEvent.h
@@ -721,8 +721,8 @@
DOMXPathNSResolver.h
DOMXPathResult.h
)
-foreach (_file ${WebCoreForwardingHeaders})
- file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebCore/${_file}>")
+foreach (_file ${ObjCForwardingHeaders})
+ file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
endforeach ()
# FIXME: These should not be necessary.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
