Permalink
Browse files

Fix non-default harfbuzz configuration logic (#4848)

  • Loading branch information...
tbonfort authored and root committed Jan 21, 2014
1 parent 6e79f0a commit ff83a55d4fa3ffa40d18807576d6c986b8a60b4b
Showing with 3 additions and 2 deletions.
  1. +2 −1 cmake/FindHarfBuzz.cmake
  2. +1 −1 fontcache.h
View
@@ -37,6 +37,7 @@ pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.18)
find_path(HARFBUZZ_INCLUDE_DIR NAMES hb.h
HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
+ PATH_SUFFIXES harfbuzz
)
find_library(HARFBUZZ_LIBRARY NAMES harfbuzz
@@ -47,4 +48,4 @@ set(HARFBUZZ_INCLUDE_DIRS ${HARFBUZZ_INCLUDE_DIR})
set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY})
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIR HARFBUZZ_LIBRARY)
-mark_as_advanced(HARFBUZZ_LIBRARY HARFBUZZ_INCLUDE_DIR)
+mark_as_advanced(HARFBUZZ_LIBRARY HARFBUZZ_INCLUDE_DIR)
View
@@ -12,7 +12,7 @@
#else
#include <fribidi/fribidi.h>
#endif
- #include <harfbuzz/hb-ft.h>
+ #include <hb-ft.h>
#endif

0 comments on commit ff83a55

Please sign in to comment.