--- webkit-efl-svn-r127150/Source/cmake/FindHarfBuzz.cmake.orig 2012-08-30 20:44:46.000000000 +0200 +++ webkit-efl-svn-r127150/Source/cmake/FindHarfBuzz.cmake 2013-07-21 15:10:41.231121247 +0200 @@ -33,14 +33,20 @@ INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(PC_HARFBUZZ harfbuzz>=0.9.0) +PKG_CHECK_MODULES(PC_HARFBUZZ_ICU harfbuzz-icu) FIND_PATH(HARFBUZZ_INCLUDE_DIRS NAMES hb.h HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} ) -FIND_LIBRARY(HARFBUZZ_LIBRARIES NAMES harfbuzz +FIND_LIBRARY(HARFBUZZ_LIBRARY NAMES harfbuzz HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} ) +FIND_LIBRARY(HARFBUZZ_ICU_LIBRARY NAMES harfbuzz-icu + HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR} +) +SET(HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARY} ${HARFBUZZ_LIBRARY}") + INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES) --- webkit-efl-svn-r127150/Source/WebCore/PlatformEfl.cmake.orig 2012-08-30 20:44:46.000000000 +0200 +++ webkit-efl-svn-r127150/Source/WebCore/PlatformEfl.cmake 2013-07-21 21:19:51.196858362 +0200 @@ -167,7 +167,8 @@ platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp ) LIST(APPEND WebCore_LIBRARIES - ${HARFBUZZ_LIBRARIES} + ${HARFBUZZ_ICU_LIBRARY} + ${HARFBUZZ_LIBRARY} ) ENDIF () ENDIF ()