Merge r228136 - [cmake] Fix build with ICU configured without collati…

…on support https://bugs.webkit.org/show_bug.cgi?id=182498 Reviewed by Alex Christensen. WebKit has CollatorDefault.cpp providing necessary stubs when UCONFIG_NO_COLLATION is defined, however it is not included in cmake file list. * wtf/CMakeLists.txt:
WebKit · Feb 19, 2018 · 2e6ba1c · 2e6ba1c
1 parent 3667cfc
commit 2e6ba1c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
@@ -1,3 +1,16 @@
+2018-02-05  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake] Fix build with ICU configured without collation support
+        https://bugs.webkit.org/show_bug.cgi?id=182498
+
+        Reviewed by Alex Christensen.
+
+        WebKit has CollatorDefault.cpp providing necessary stubs when
+        UCONFIG_NO_COLLATION is defined, however it is not included in cmake
+        file list.
+
+        * wtf/CMakeLists.txt:
+
 2018-02-05  Alicia Boya García  <aboya@igalia.com>
 
         Fix bug in MediaTime comparison for negative values with different scale.

diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
@@ -459,6 +459,8 @@ if (NOT USE_SYSTEM_MALLOC)
 endif ()
 
 list(APPEND WTF_SOURCES
+    unicode/CollatorDefault.cpp
+
     unicode/icu/CollatorICU.cpp
 )
 set(WTF_SYSTEM_INCLUDE_DIRECTORIES