blob: a15364f127d8451a96be4e466735f7ccf1a7da89 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
Index: Source/WebCore/PlatformEfl.cmake
===================================================================
--- Source/WebCore/PlatformEfl.cmake (revision 154249)
+++ Source/WebCore/PlatformEfl.cmake (working copy)
@@ -217,6 +217,7 @@
${LIBSOUP_LIBRARIES}
${ZLIB_LIBRARIES}
${HARFBUZZ_LIBRARIES}
+ ${HARFBUZZ_ICU_LIBRARIES}
)
list(APPEND WebCore_INCLUDE_DIRECTORIES
Index: Source/WebKit2/PlatformEfl.cmake
===================================================================
--- Source/WebKit2/PlatformEfl.cmake (revision 154249)
+++ Source/WebKit2/PlatformEfl.cmake (working copy)
@@ -237,6 +237,7 @@
${EVAS_LIBRARIES}
${Freetype_LIBRARIES}
${HARFBUZZ_LIBRARIES}
+ ${HARFBUZZ_ICU_LIBRARIES}
${LIBXML2_LIBRARIES}
${OPENGL_LIBRARIES}
${SQLITE_LIBRARIES}
Index: Source/cmake/FindHarfBuzz.cmake
===================================================================
--- Source/cmake/FindHarfBuzz.cmake (revision 154249)
+++ Source/cmake/FindHarfBuzz.cmake (working copy)
@@ -33,6 +33,7 @@
include(FindPkgConfig)
pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7)
+pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu)
find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
@@ -42,5 +43,9 @@
HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
)
+find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu
+ HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR}
+)
+
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES HARFBUZZ_ICU_LIBRARIES)
|