Title: [191569] releases/WebKitGTK/webkit-2.10
- Revision
- 191569
- Author
- [email protected]
- Date
- 2015-10-26 01:18:03 -0700 (Mon, 26 Oct 2015)
Log Message
Merge r191442 - [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: releases/WebKitGTK/webkit-2.10/ChangeLog (191568 => 191569)
--- releases/WebKitGTK/webkit-2.10/ChangeLog 2015-10-26 08:16:18 UTC (rev 191568)
+++ releases/WebKitGTK/webkit-2.10/ChangeLog 2015-10-26 08:18:03 UTC (rev 191569)
@@ -1,3 +1,12 @@
+2015-10-22 Philippe Normand <[email protected]>
+
+ [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-15 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.2 release.
Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/FindICU.cmake (191568 => 191569)
--- releases/WebKitGTK/webkit-2.10/Source/cmake/FindICU.cmake 2015-10-26 08:16:18 UTC (rev 191568)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/FindICU.cmake 2015-10-26 08:18:03 UTC (rev 191569)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
