Changeset 196613 in webkit

Timestamp:

Feb 15, 2016 6:32:55 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Re-enable INTL on WinCairo
​https://bugs.webkit.org/show_bug.cgi?id=154256

Patch by Alex Christensen <​achristensen@webkit.org> on 2016-02-15
Reviewed by Michael Catanzaro.

• Source/cmake/OptionsWin.cmake:

Peavo updated icu and it works, so let's re-enable INTL on WinCairo to catch Windows build failures.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsWin.cmake (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2016-02-15  Alex Christensen  <achristensen@webkit.org>
+
+        Re-enable INTL on WinCairo
+        https://bugs.webkit.org/show_bug.cgi?id=154256
+
+        Reviewed by Michael Catanzaro.
+
+        * Source/cmake/OptionsWin.cmake:
+        Peavo updated icu and it works, so let's re-enable INTL on WinCairo to catch Windows build failures.
+
 2016-02-12  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/cmake/OptionsWin.cmake

@@ -38 +38 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PUBLIC OFF)
@@ -75 +74 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_SOCKETS PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBVTT_REGIONS PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
@@ -84 +82 @@
 if (${WTF_PLATFORM_WIN_CAIRO})
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 PUBLIC OFF)
+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC ON)
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
 else ()
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 PUBLIC ON)
+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC OFF)
 endif ()