Changeset 209138 in webkit

Timestamp:

Nov 30, 2016 10:45:57 AM (7 years ago)

Author:

Brent Fulgham

Message:

[Win] Apple build is using incorrect ICU library (if present)
​https://bugs.webkit.org/show_bug.cgi?id=164934
<rdar://problem/29329654>

Reviewed by Alex Christensen.

Move the 'icuuc.lib' and 'icuin.lib' library names to the end of the set of choices when searching for ICU.
so that we preferentially select the 'new' version of these libraries if they are available.

• Source/cmake/FindICU.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/FindICU.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2016-11-30  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Apple build is using incorrect ICU library (if present)
+        https://bugs.webkit.org/show_bug.cgi?id=164934
+        <rdar://problem/29329654>
+
+        Reviewed by Alex Christensen.
+
+        Move the 'icuuc.lib' and 'icuin.lib' library names to the end of the set of choices when searching for ICU.
+        so that we preferentially select the 'new' version of these libraries if they are available.
+
+        * Source/cmake/FindICU.cmake:
+
 2016-11-23  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/cmake/FindICU.cmake

@@ -26 +26 @@
 find_library(
     ICU_LIBRARY
-    NAMES icuuc libicuuc cygicuuc cygicuuc32
+    NAMES libicuuc cygicuuc cygicuuc32 icuuc
     HINTS ${PC_ICU_LIBRARY_DIRS}
           ${PC_ICU_LIBDIR}
@@ -52 +52 @@
     find_library(
         ICU_I18N_LIBRARY
-        NAMES icui18n icuin libicui18n libicuin cygicuin cygicuin32
+        NAMES icui18n libicui18n libicuin cygicuin cygicuin32 icuin
         HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
               ${PC_ICU_I18N_LIBDIR}