Changeset 191442 in webkit

Timestamp:

Oct 22, 2015 12:07:41 AM (9 years ago)

Author:

Philippe Normand

Message:

[GTK][Mac] ICU-related build fixes
​https://bugs.webkit.org/show_bug.cgi?id=150032

Rubber-stamped by Darin Adler.

• Source/cmake/FindICU.cmake: Use pkg-config to hint at icu-i18n's library location.

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2015-10-22  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK][Mac] ICU-related build fixes
+        https://bugs.webkit.org/show_bug.cgi?id=150032
+
+        Rubber-stamped by Darin Adler.
+
+        * Source/cmake/FindICU.cmake: Use pkg-config to hint at icu-i18n's library location.
+
 2015-10-20  Yoav Weiss  <yoav@yoav.ws>
 

trunk/Source/cmake/FindICU.cmake

@@ -47 +47 @@
 
     # Look for the ICU internationalization libraries
+    pkg_check_modules(PC_ICU_I18N icu-i18n)
     find_library(
         ICU_I18N_LIBRARY
-        NAMES icuin icui18n cygicuin cygicuin32
+        NAMES icui18n icuin cygicuin cygicuin32
+        HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
+              ${PC_ICU_I18N_LIBDIR}
         DOC "Libraries to link against for ICU internationalization")
     mark_as_advanced(ICU_I18N_LIBRARY)