Title: [173655] trunk
- Revision
- 173655
- Author
- [email protected]
- Date
- 2014-09-16 01:57:12 -0700 (Tue, 16 Sep 2014)
Log Message
Fix FindICU.cmake
https://bugs.webkit.org/show_bug.cgi?id=136820
Patch by Tibor Meszaros <[email protected]> on 2014-09-16
Reviewed by Csaba Osztrogonác.
* Source/cmake/FindICU.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (173654 => 173655)
--- trunk/ChangeLog 2014-09-16 08:46:10 UTC (rev 173654)
+++ trunk/ChangeLog 2014-09-16 08:57:12 UTC (rev 173655)
@@ -1,3 +1,12 @@
+2014-09-16 Tibor Meszaros <[email protected]>
+
+ Fix FindICU.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=136820
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Source/cmake/FindICU.cmake:
+
2014-09-15 Zan Dobersek <[email protected]>
[CMake] Remove FIND_PACKAGE_HANDLE_STANDARD_ARGS call for WAYLAND_EGL in FindWayland.cmake
Modified: trunk/Source/cmake/FindICU.cmake (173654 => 173655)
--- trunk/Source/cmake/FindICU.cmake 2014-09-16 08:46:10 UTC (rev 173654)
+++ trunk/Source/cmake/FindICU.cmake 2014-09-16 08:57:12 UTC (rev 173655)
@@ -9,10 +9,15 @@
# ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
# (note: in addition to ICU_LIBRARIES)
+find_package(PkgConfig)
+pkg_check_modules(PC_ICU icu-uc)
+
# Look for the header file.
find_path(
ICU_INCLUDE_DIR
NAMES unicode/utypes.h
+ HINTS ${PC_ICU_INCLUDE_DIRS}
+ ${PC_ICU_INCLUDEDIR}
DOC "Include directory for the ICU library")
mark_as_advanced(ICU_INCLUDE_DIR)
@@ -20,6 +25,8 @@
find_library(
ICU_LIBRARY
NAMES icuuc cygicuuc cygicuuc32
+ HINTS ${PC_ICU_LIBRARY_DIRS}
+ ${PC_ICU_LIBDIR}
DOC "Libraries to link against for the common parts of ICU")
mark_as_advanced(ICU_LIBRARY)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
