Title: [191442] trunk
- Revision
- 191442
- Author
- ph...@webkit.org
- Date
- 2015-10-22 00:07:41 -0700 (Thu, 22 Oct 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (191441 => 191442)
--- trunk/ChangeLog 2015-10-22 06:59:04 UTC (rev 191441)
+++ trunk/ChangeLog 2015-10-22 07:07:41 UTC (rev 191442)
@@ -1,3 +1,12 @@
+2015-10-22 Philippe Normand <pnorm...@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 <y...@yoav.ws>
Rename the PICTURE_SIZES flag to CURRENTSRC
Modified: trunk/Source/cmake/FindICU.cmake (191441 => 191442)
--- trunk/Source/cmake/FindICU.cmake 2015-10-22 06:59:04 UTC (rev 191441)
+++ trunk/Source/cmake/FindICU.cmake 2015-10-22 07:07:41 UTC (rev 191442)
@@ -46,9 +46,12 @@
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)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
