Title: [198854] trunk/Source/WebCore
- Revision
- 198854
- Author
- [email protected]
- Date
- 2016-03-30 13:39:08 -0700 (Wed, 30 Mar 2016)
Log Message
Fix Windows EWS after r198766
https://bugs.webkit.org/show_bug.cgi?id=156029
Patch by Alex Christensen <[email protected]> on 2016-03-30
Reviewed by Brent Fulgham.
* CMakeLists.txt:
* PlatformWin.cmake:
Copy headers before compiling WebCoreDerivedSources, not just before compiling WebCore.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (198853 => 198854)
--- trunk/Source/WebCore/CMakeLists.txt 2016-03-30 19:46:23 UTC (rev 198853)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-03-30 20:39:08 UTC (rev 198854)
@@ -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: trunk/Source/WebCore/ChangeLog (198853 => 198854)
--- trunk/Source/WebCore/ChangeLog 2016-03-30 19:46:23 UTC (rev 198853)
+++ trunk/Source/WebCore/ChangeLog 2016-03-30 20:39:08 UTC (rev 198854)
@@ -1,3 +1,14 @@
+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-03-30 Brady Eidson <[email protected]>
Random SerializedScriptValue cleanup.
Modified: trunk/Source/WebCore/PlatformWin.cmake (198853 => 198854)
--- trunk/Source/WebCore/PlatformWin.cmake 2016-03-30 19:46:23 UTC (rev 198853)
+++ trunk/Source/WebCore/PlatformWin.cmake 2016-03-30 20:39:08 UTC (rev 198854)
@@ -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
