Fix non-default harfbuzz configuration logic (#4848)

Author: tbonfort

cmake/FindHarfBuzz.cmake

@@ -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)

fontcache.h

@@ -12,7 +12,7 @@
  #else
   #include <fribidi/fribidi.h>
  #endif
- #include <harfbuzz/hb-ft.h>
+ #include <hb-ft.h>
 #endif