Changeset 195500 in webkit

Timestamp:

Jan 22, 2016, 6:00:41 PM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merged r195498. rdar://problem/24310408

Location:

tags/Safari-602.1.17.0.1

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/WinTools.make (modified) (1 diff)
• Source/cmake/tools/vsprops (copied) (copied from trunk/Source/cmake/tools/vsprops )

tags/Safari-602.1.17.0.1/ChangeLog

@@ +1 @@
+2016-01-22  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r195498.
+
+    2016-01-22  Alex Christensen  <achristensen@webkit.org>
+
+            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  <mcatanzaro@igalia.com>
 

tags/Safari-602.1.17.0.1/Source/cmake/WinTools.make

@@ -2 +2 @@
     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
+    xcopy "$(SRCROOT)\tools\vsprops\*" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y