Skip to content

Commit ff83a55

Browse files
tbonfortroot
authored and
root
committed
Fix non-default harfbuzz configuration logic (#4848)
1 parent 6e79f0a commit ff83a55

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cmake/FindHarfBuzz.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.18)
3737

3838
find_path(HARFBUZZ_INCLUDE_DIR NAMES hb.h
3939
HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
40+
PATH_SUFFIXES harfbuzz
4041
)
4142

4243
find_library(HARFBUZZ_LIBRARY NAMES harfbuzz
@@ -47,4 +48,4 @@ set(HARFBUZZ_INCLUDE_DIRS ${HARFBUZZ_INCLUDE_DIR})
4748
set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY})
4849
include(FindPackageHandleStandardArgs)
4950
FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIR HARFBUZZ_LIBRARY)
50-
mark_as_advanced(HARFBUZZ_LIBRARY HARFBUZZ_INCLUDE_DIR)
51+
mark_as_advanced(HARFBUZZ_LIBRARY HARFBUZZ_INCLUDE_DIR)

fontcache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#else
1313
#include <fribidi/fribidi.h>
1414
#endif
15-
#include <harfbuzz/hb-ft.h>
15+
#include <hb-ft.h>
1616
#endif
1717

1818

0 commit comments

Comments
 (0)