[GTK][Mac] ICU-related build fixes
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Oct 2015 07:07:41 +0000 (07:07 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Oct 2015 07:07:41 +0000 (07:07 +0000)
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.

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

ChangeLog
Source/cmake/FindICU.cmake

index 4f42051..7310421 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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>
 
         Rename the PICTURE_SIZES flag to CURRENTSRC
index b7bd30a..4e93286 100644 (file)
@@ -46,9 +46,12 @@ if (ICU_INCLUDE_DIR AND ICU_LIBRARY)
     set(ICU_VERSION "${ICU_MAJOR_VERSION}.${ICU_MINOR_VERSION}")
 
     # 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)
     if (ICU_I18N_LIBRARY)