Title: [209138] trunk
Revision
209138
Author
[email protected]
Date
2016-11-30 10:45:57 -0800 (Wed, 30 Nov 2016)

Log 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:

Modified Paths

Diff

Modified: trunk/ChangeLog (209137 => 209138)


--- trunk/ChangeLog	2016-11-30 18:42:14 UTC (rev 209137)
+++ trunk/ChangeLog	2016-11-30 18:45:57 UTC (rev 209138)
@@ -1,3 +1,16 @@
+2016-11-30  Brent Fulgham  <[email protected]>
+
+        [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  <[email protected]>
 
         Remove ENABLE_ASSEMBLER_WX_EXCLUSIVE code

Modified: trunk/Source/cmake/FindICU.cmake (209137 => 209138)


--- trunk/Source/cmake/FindICU.cmake	2016-11-30 18:42:14 UTC (rev 209137)
+++ trunk/Source/cmake/FindICU.cmake	2016-11-30 18:45:57 UTC (rev 209138)
@@ -25,7 +25,7 @@
 # Look for the library.
 find_library(
     ICU_LIBRARY
-    NAMES icuuc libicuuc cygicuuc cygicuuc32
+    NAMES libicuuc cygicuuc cygicuuc32 icuuc
     HINTS ${PC_ICU_LIBRARY_DIRS}
           ${PC_ICU_LIBDIR}
           ${WEBKIT_LIBRARIES_LINK_DIR}
@@ -51,7 +51,7 @@
     pkg_check_modules(PC_ICU_I18N icu-i18n)
     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}
               ${WEBKIT_LIBRARIES_LINK_DIR}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to