Title: [195500] tags/Safari-602.1.17.0.1
- Revision
- 195500
- Author
- [email protected]
- Date
- 2016-01-22 18:00:41 -0800 (Fri, 22 Jan 2016)
Log Message
Merged r195498. rdar://problem/24310408
Modified Paths
Added Paths
- tags/Safari-602.1.17.0.1/Source/cmake/tools/vsprops/
Diff
Modified: tags/Safari-602.1.17.0.1/ChangeLog (195499 => 195500)
--- tags/Safari-602.1.17.0.1/ChangeLog 2016-01-23 01:48:39 UTC (rev 195499)
+++ tags/Safari-602.1.17.0.1/ChangeLog 2016-01-23 02:00:41 UTC (rev 195500)
@@ -1,3 +1,20 @@
+2016-01-22 Babak Shafiei <[email protected]>
+
+ Merge r195498.
+
+ 2016-01-22 Alex Christensen <[email protected]>
+
+ Fix internal Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=153385
+ rdar://problem/24310408
+
+ Reviewed by Brian Weinstein.
+
+ * Source/cmake/WinTools.make:
+ * Source/cmake/tools/vsprops: Copied from WebKitLibraries/win/tools/vsprops.
+ These property sheets are needed for some projects that are not in this repository
+ and don't use CMake in the official build. We want to leave them unchanged for now.
+
2016-01-18 Michael Catanzaro <[email protected]>
[CMake] Duplicate attempts to find software during cmake stage
Modified: tags/Safari-602.1.17.0.1/Source/cmake/WinTools.make (195499 => 195500)
--- tags/Safari-602.1.17.0.1/Source/cmake/WinTools.make 2016-01-23 01:48:39 UTC (rev 195499)
+++ tags/Safari-602.1.17.0.1/Source/cmake/WinTools.make 2016-01-23 02:00:41 UTC (rev 195500)
@@ -1,3 +1,4 @@
install:
xcopy "$(SRCROOT)\*.cmake" "$(DSTROOT)\AppleInternal\tools\cmake" /e/v/i/h/y
- xcopy "$(SRCROOT)\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
\ No newline at end of file
+ xcopy "$(SRCROOT)\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
+ xcopy "$(SRCROOT)\tools\vsprops\*" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
