Title: [199051] tags/Safari-602.1.26.0.2/Source/WebCore
- Revision
- 199051
- Author
- [email protected]
- Date
- 2016-04-04 23:18:48 -0700 (Mon, 04 Apr 2016)
Log Message
Merged r198854. rdar://problem/25489003
Modified Paths
Diff
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/CMakeLists.txt (199050 => 199051)
--- tags/Safari-602.1.26.0.2/Source/WebCore/CMakeLists.txt 2016-04-05 06:17:52 UTC (rev 199050)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/CMakeLists.txt 2016-04-05 06:18:48 UTC (rev 199051)
@@ -3813,6 +3813,8 @@
WEBKIT_FRAMEWORK(WebCore)
if (WIN32)
+ add_custom_target(WebCoreDerivedSources_PreBuild COMMAND ${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND} VERBATIM)
+ add_dependencies(WebCoreDerivedSources WebCoreDerivedSources_PreBuild)
add_dependencies(WebCore WebCoreDerivedSources)
endif ()
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/ChangeLog (199050 => 199051)
--- tags/Safari-602.1.26.0.2/Source/WebCore/ChangeLog 2016-04-05 06:17:52 UTC (rev 199050)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/ChangeLog 2016-04-05 06:18:48 UTC (rev 199051)
@@ -1,5 +1,20 @@
2016-04-04 Babak Shafiei <[email protected]>
+ Merge r198854.
+
+ 2016-03-30 Alex Christensen <[email protected]>
+
+ Fix Windows EWS after r198766
+ https://bugs.webkit.org/show_bug.cgi?id=156029
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+ Copy headers before compiling WebCoreDerivedSources, not just before compiling WebCore.
+
+2016-04-04 Babak Shafiei <[email protected]>
+
Merge r198850.
2016-03-30 Brent Fulgham <[email protected]>
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/PlatformWin.cmake (199050 => 199051)
--- tags/Safari-602.1.26.0.2/Source/WebCore/PlatformWin.cmake 2016-04-05 06:17:52 UTC (rev 199050)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/PlatformWin.cmake 2016-04-05 06:18:48 UTC (rev 199051)
@@ -295,10 +295,10 @@
file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore)
-set(WebCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/preBuild.cmd")
-file(WRITE "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
+set(WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/preBuild.cmd")
+file(WRITE "${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
foreach (_directory ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
- file(APPEND "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
+ file(APPEND "${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
endforeach ()
set(WebCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/postBuild.cmd")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
