Changeset 187918 in webkit


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r187866 r187918  
     12015-08-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix quirks with CMake and VS2015
     4        https://bugs.webkit.org/show_bug.cgi?id=147663
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * Source/cmake/OptionsWindows.cmake:
     9        Hide some warnings.  Using the same variable names in nested scopes is ok for now.
     10        Disable INTL for now.
     11
    1122015-08-04  Alex Christensen  <achristensen@webkit.org>
    213
  • trunk/Source/WTF/ChangeLog

    r187908 r187918  
     12015-08-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix quirks with CMake and VS2015
     4        https://bugs.webkit.org/show_bug.cgi?id=147663
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * wtf/Platform.h:
     9        Build fix after r187908
     10
    1112015-08-04  Brent Fulgham  <bfulgham@apple.com>
    212
  • trunk/Source/WTF/wtf/Platform.h

    r187908 r187918  
    11071107#endif
    11081108
    1109 #if COMPILER(MSVC) && _MSC_VER < 1900
     1109#if COMPILER(MSVC)
    11101110#undef __STDC_LIMIT_MACROS
    11111111#define __STDC_LIMIT_MACROS
     1112#if _MSC_VER < 1900
    11121113#undef _HAS_EXCEPTIONS
    11131114#define _HAS_EXCEPTIONS 1
     1115#endif
    11141116#endif
    11151117
  • trunk/Source/cmake/OptionsWindows.cmake

    r187866 r187918  
    66WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
    77WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
     8WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
    89WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_VENDOR_PREFIXES PUBLIC OFF)
    910WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PICTURE_SIZES PUBLIC OFF)
     
    2526        /wd4018 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4146 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4267 /wd4275 /wd4288
    2627        /wd4291 /wd4305 /wd4309 /wd4344 /wd4355 /wd4389 /wd4396 /wd4481 /wd4503 /wd4505 /wd4510 /wd4512 /wd4530 /wd4610 /wd4702
    27         /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387
     28        /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387 /wd4456 /wd4458
    2829    )
    2930    if (NOT ${CMAKE_GENERATOR} MATCHES "Ninja")
  • trunk/WebKitLibraries/ChangeLog

    r187908 r187918  
     12015-08-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix quirks with CMake and VS2015
     4        https://bugs.webkit.org/show_bug.cgi?id=147663
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * win/tools/vsprops/common.props:
     9        Hide some warnings.  Using the same variable names in nested scopes is ok for now.
     10
    1112015-08-04  Brent Fulgham  <bfulgham@apple.com>
    212
  • trunk/WebKitLibraries/win/tools/vsprops/common.props

    r187908 r187918  
    4949      <TreatWarningAsError>false</TreatWarningAsError>
    5050      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    51       <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>
     51      <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>
    5252      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    5353      <RuntimeLibrary Condition="$(Configuration)=='Release_WinCairo' or $(Configuration)=='Debug_WinCairo'">MultiThreadedDLL</RuntimeLibrary>
Note: See TracChangeset for help on using the changeset viewer.