pyrox.dev
1--- webkitgtk-2.6.1.orig/Source/cmake/FindHarfBuzz.cmake 2014-10-09 01:54:38.000000000 +0800
2+++ webkitgtk-2.6.1/Source/cmake/FindHarfBuzz.cmake 2014-10-15 13:41:29.832290412 +0800
3@@ -34,21 +34,39 @@
4
5 pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7)
6
7-find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
8- HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
9-)
10-
11-find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
12- HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
13-)
14-
15 # HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library.
16 if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17")
17 pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 REQUIRED)
18- find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu
19+
20+ find_path(HARFBUZZ_ICU_INCLUDEDIR NAMES hb-icu.h
21+ HINTS ${PC_HARFBUZZ_ICU_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
22+ )
23+
24+ find_library(HARFBUZZ_ICU_LIBRARY NAMES harfbuzz-icu
25 HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR}
26 )
27- list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}")
28+
29+ find_library(HARFBUZZ_LIBRARY NAMES harfbuzz
30+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
31+ )
32+
33+ set(HARFBUZZ_INCLUDE_DIRS
34+ ${PC_HARFBUZZ_INCLUDE_DIRS} ${HARFBUZZ_ICU_INCLUDEDIR}
35+ CACHE INTERNAL ""
36+ )
37+
38+ set(HARFBUZZ_LIBRARIES
39+ ${HARFBUZZ_LIBRARY} ${HARFBUZZ_ICU_LIBRARY}
40+ CACHE INTERNAL ""
41+ )
42+else ()
43+ find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
44+ HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
45+ )
46+
47+ find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
48+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
49+ )
50 endif ()
51
52 include(FindPackageHandleStandardArgs)