Title: [198773] trunk
- Revision
- 198773
- Author
- [email protected]
- Date
- 2016-03-28 19:03:22 -0700 (Mon, 28 Mar 2016)
Log Message
Fix Mac Ninja build after r198766.
.:
* Source/cmake/WebKitMacros.cmake:
WebCore_DERIVED_SOURCES are intentionally in a separate library to reduce linker line length.
This is now only specific to WebKit2_DERIVED_SOURCES, so I'm moving it there.
Source/WebKit2:
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/ChangeLog (198772 => 198773)
--- trunk/ChangeLog 2016-03-29 01:27:51 UTC (rev 198772)
+++ trunk/ChangeLog 2016-03-29 02:03:22 UTC (rev 198773)
@@ -1,5 +1,13 @@
2016-03-28 Alex Christensen <[email protected]>
+ Fix Mac Ninja build after r198766.
+
+ * Source/cmake/WebKitMacros.cmake:
+ WebCore_DERIVED_SOURCES are intentionally in a separate library to reduce linker line length.
+ This is now only specific to WebKit2_DERIVED_SOURCES, so I'm moving it there.
+
+2016-03-28 Alex Christensen <[email protected]>
+
Fix Windows build after r198766.
* Source/cmake/WebKitMacros.cmake:
Modified: trunk/Source/WebKit2/CMakeLists.txt (198772 => 198773)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-03-29 01:27:51 UTC (rev 198772)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-03-29 02:03:22 UTC (rev 198773)
@@ -826,6 +826,8 @@
${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxyScriptSource.h
)
+list(APPEND WebKit2_SOURCES ${WebKit2_DERIVED_SOURCES})
+
WEBKIT_FRAMEWORK(WebKit2)
add_dependencies(WebKit2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES})
add_webkit2_prefix_header(WebKit2)
Modified: trunk/Source/WebKit2/ChangeLog (198772 => 198773)
--- trunk/Source/WebKit2/ChangeLog 2016-03-29 01:27:51 UTC (rev 198772)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-29 02:03:22 UTC (rev 198773)
@@ -1,3 +1,9 @@
+2016-03-28 Alex Christensen <[email protected]>
+
+ Fix Mac Ninja build after r198766.
+
+ * CMakeLists.txt:
+
2016-03-28 Brady Eidson <[email protected]>
Modern IDB: Remove abstract base classes for all IDB DOM classes.
Modified: trunk/Source/cmake/WebKitMacros.cmake (198772 => 198773)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-03-29 01:27:51 UTC (rev 198772)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-03-29 02:03:22 UTC (rev 198773)
@@ -249,7 +249,6 @@
add_library(${_target} ${${_target}_LIBRARY_TYPE}
${${_target}_HEADERS}
${${_target}_SOURCES}
- ${${_target}_DERIVED_SOURCES}
)
target_link_libraries(${_target} ${${_target}_LIBRARIES})
set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
