<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187918] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187918">187918</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-08-04 16:58:35 -0700 (Tue, 04 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix quirks with CMake and VS2015
https://bugs.webkit.org/show_bug.cgi?id=147663
Reviewed by Brent Fulgham.
.:
* Source/cmake/OptionsWindows.cmake:
Hide some warnings. Using the same variable names in nested scopes is ok for now.
Disable INTL for now.
Source/WTF:
* wtf/Platform.h:
Build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/187908">r187908</a>
WebKitLibraries:
* win/tools/vsprops/common.props:
Hide some warnings. Using the same variable names in nested scopes is ok for now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourcecmakeOptionsWindowscmake">trunk/Source/cmake/OptionsWindows.cmake</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropscommonprops">trunk/WebKitLibraries/win/tools/vsprops/common.props</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (187917 => 187918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-08-04 23:55:09 UTC (rev 187917)
+++ trunk/ChangeLog 2015-08-04 23:58:35 UTC (rev 187918)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-08-04 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Fix quirks with CMake and VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147663
+
+ Reviewed by Brent Fulgham.
+
+ * Source/cmake/OptionsWindows.cmake:
+ Hide some warnings. Using the same variable names in nested scopes is ok for now.
+ Disable INTL for now.
+
+2015-08-04 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Enable WebGL on Windows CMake build.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143311
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (187917 => 187918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-08-04 23:55:09 UTC (rev 187917)
+++ trunk/Source/WTF/ChangeLog 2015-08-04 23:58:35 UTC (rev 187918)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-04 Alex Christensen <achristensen@webkit.org>
+
+ Fix quirks with CMake and VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147663
+
+ Reviewed by Brent Fulgham.
+
+ * wtf/Platform.h:
+ Build fix after r187908
+
</ins><span class="cx"> 2015-08-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Update Apple Windows build for VS2015
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (187917 => 187918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-08-04 23:55:09 UTC (rev 187917)
+++ trunk/Source/WTF/wtf/Platform.h 2015-08-04 23:58:35 UTC (rev 187918)
</span><span class="lines">@@ -1106,12 +1106,14 @@
</span><span class="cx"> #define ENABLE_PLATFORM_FONT_LOOKUP 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if COMPILER(MSVC) && _MSC_VER < 1900
</del><ins>+#if COMPILER(MSVC)
</ins><span class="cx"> #undef __STDC_LIMIT_MACROS
</span><span class="cx"> #define __STDC_LIMIT_MACROS
</span><ins>+#if _MSC_VER < 1900
</ins><span class="cx"> #undef _HAS_EXCEPTIONS
</span><span class="cx"> #define _HAS_EXCEPTIONS 1
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #define HAVE_NS_ACTIVITY 1
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWindowscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWindows.cmake (187917 => 187918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWindows.cmake 2015-08-04 23:55:09 UTC (rev 187917)
+++ trunk/Source/cmake/OptionsWindows.cmake 2015-08-04 23:58:35 UTC (rev 187918)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALLINONE_BUILD PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_VENDOR_PREFIXES PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PICTURE_SIZES PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_STREAMS_API PUBLIC ON)
</span><span class="lines">@@ -24,7 +25,7 @@
</span><span class="cx"> add_definitions(
</span><span class="cx"> /wd4018 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4146 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4267 /wd4275 /wd4288
</span><span class="cx"> /wd4291 /wd4305 /wd4309 /wd4344 /wd4355 /wd4389 /wd4396 /wd4481 /wd4503 /wd4505 /wd4510 /wd4512 /wd4530 /wd4610 /wd4702
</span><del>- /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387
</del><ins>+ /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387 /wd4456 /wd4458
</ins><span class="cx"> )
</span><span class="cx"> if (NOT ${CMAKE_GENERATOR} MATCHES "Ninja")
</span><span class="cx"> add_definitions(/MP)
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (187917 => 187918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2015-08-04 23:55:09 UTC (rev 187917)
+++ trunk/WebKitLibraries/ChangeLog 2015-08-04 23:58:35 UTC (rev 187918)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-04 Alex Christensen <achristensen@webkit.org>
+
+ Fix quirks with CMake and VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147663
+
+ Reviewed by Brent Fulgham.
+
+ * win/tools/vsprops/common.props:
+ Hide some warnings. Using the same variable names in nested scopes is ok for now.
+
</ins><span class="cx"> 2015-08-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Update Apple Windows build for VS2015
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropscommonprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/common.props (187917 => 187918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/common.props 2015-08-04 23:55:09 UTC (rev 187917)
+++ trunk/WebKitLibraries/win/tools/vsprops/common.props 2015-08-04 23:58:35 UTC (rev 187918)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> <WarningLevel>Level4</WarningLevel>
</span><span class="cx"> <TreatWarningAsError>false</TreatWarningAsError>
</span><span class="cx"> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</span><del>- <DisableSpecificWarnings>4018;4068;4099;4100;4127;4138;4146;4180;4189;4201;4244;4251;4267;4275;4288;4291;4305;4309;4344;4355;4389;4396;4481;4503;4505;4510;4512;4530;4610;4702;4706;4800;4819;4951;4952;4996;6011;6031;6211;6246;6255;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</del><ins>+ <DisableSpecificWarnings>4458;4456;4018;4068;4099;4100;4127;4138;4146;4180;4189;4201;4244;4251;4267;4275;4288;4291;4305;4309;4344;4355;4389;4396;4481;4503;4505;4510;4512;4530;4610;4702;4706;4800;4819;4951;4952;4996;6011;6031;6211;6246;6255;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ins><span class="cx"> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</span><span class="cx"> <RuntimeLibrary Condition="$(Configuration)=='Release_WinCairo' or $(Configuration)=='Debug_WinCairo'">MultiThreadedDLL</RuntimeLibrary>
</span><span class="cx"> <FunctionLevelLinking>false</FunctionLevelLinking>
</span></span></pre>
</div>
</div>
</body>
</html>