[Win] Apple build is using incorrect ICU library (if present)
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Nov 2016 18:45:57 +0000 (18:45 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Nov 2016 18:45:57 +0000 (18:45 +0000)
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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@209138 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/cmake/FindICU.cmake

index 48708b6..68a854d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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>
 
         Remove ENABLE_ASSEMBLER_WX_EXCLUSIVE code
 2016-11-23  Zan Dobersek  <zdobersek@igalia.com>
 
         Remove ENABLE_ASSEMBLER_WX_EXCLUSIVE code
index 57a4592..f9d79c1 100644 (file)
@@ -25,7 +25,7 @@ mark_as_advanced(ICU_INCLUDE_DIR)
 # Look for the library.
 find_library(
     ICU_LIBRARY
 # 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}
     HINTS ${PC_ICU_LIBRARY_DIRS}
           ${PC_ICU_LIBDIR}
           ${WEBKIT_LIBRARIES_LINK_DIR}
@@ -51,7 +51,7 @@ if (ICU_INCLUDE_DIR AND ICU_LIBRARY)
     pkg_check_modules(PC_ICU_I18N icu-i18n)
     find_library(
         ICU_I18N_LIBRARY
     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}
         HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
               ${PC_ICU_I18N_LIBDIR}
               ${WEBKIT_LIBRARIES_LINK_DIR}