Changeset 187918 in webkit

Timestamp:

Aug 4, 2015, 4:58:35 PM (10 years ago)

Author:

achristensen@apple.com

Message:

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 r187908

WebKitLibraries:

• win/tools/vsprops/common.props:

Hide some warnings. Using the same variable names in nested scopes is ok for now.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/Platform.h (modified) (1 diff)
• Source/cmake/OptionsWindows.cmake (modified) (2 diffs)
• WebKitLibraries/ChangeLog (modified) (1 diff)
• WebKitLibraries/win/tools/vsprops/common.props (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+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.
+
+        * 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>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+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
+
 2015-08-04  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1107 +1107 @@
 #endif
 
-#if COMPILER(MSVC) && _MSC_VER < 1900
+#if COMPILER(MSVC)
 #undef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
+#if _MSC_VER < 1900
 #undef _HAS_EXCEPTIONS
 #define _HAS_EXCEPTIONS 1
+#endif
 #endif
 

trunk/Source/cmake/OptionsWindows.cmake

@@ -6 +6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_VENDOR_PREFIXES PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PICTURE_SIZES PUBLIC OFF)
@@ -25 +26 @@
         /wd4018 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4146 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4267 /wd4275 /wd4288
         /wd4291 /wd4305 /wd4309 /wd4344 /wd4355 /wd4389 /wd4396 /wd4481 /wd4503 /wd4505 /wd4510 /wd4512 /wd4530 /wd4610 /wd4702
-        /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387
+        /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387 /wd4456 /wd4458
     )
     if (NOT ${CMAKE_GENERATOR} MATCHES "Ninja")

trunk/WebKitLibraries/ChangeLog

@@ +1 @@
+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.
+
 2015-08-04  Brent Fulgham  <bfulgham@apple.com>
 

trunk/WebKitLibraries/win/tools/vsprops/common.props

@@ -49 +49 @@
       <TreatWarningAsError>false</TreatWarningAsError>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <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>
+      <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>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeLibrary Condition="$(Configuration)=='Release_WinCairo' or $(Configuration)=='Debug_WinCairo'">MultiThreadedDLL</RuntimeLibrary>