Title: [271069] trunk
- Revision
- 271069
- Author
- [email protected]
- Date
- 2020-12-23 08:52:58 -0800 (Wed, 23 Dec 2020)
Log Message
[CMake] Fix seperated include dir of harfbuzz and harfbuzz-icu
https://bugs.webkit.org/show_bug.cgi?id=220082
Patch by Monson Shao <[email protected]> on 2020-12-23
Reviewed by Alex Christensen.
In some distros (NixOS) harfbuzz and harfbuzz-icu may have different include dir.
* Source/cmake/FindHarfBuzz.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (271068 => 271069)
--- trunk/ChangeLog 2020-12-23 00:12:04 UTC (rev 271068)
+++ trunk/ChangeLog 2020-12-23 16:52:58 UTC (rev 271069)
@@ -1,3 +1,14 @@
+2020-12-23 Monson Shao <[email protected]>
+
+ [CMake] Fix seperated include dir of harfbuzz and harfbuzz-icu
+ https://bugs.webkit.org/show_bug.cgi?id=220082
+
+ Reviewed by Alex Christensen.
+
+ In some distros (NixOS) harfbuzz and harfbuzz-icu may have different include dir.
+
+ * Source/cmake/FindHarfBuzz.cmake:
+
2020-12-21 Ryan Hostetler <[email protected]>
$(findstring iphone,$(SDKROOT)) fails when SDKROOT is not lowercase
Modified: trunk/Source/cmake/FindHarfBuzz.cmake (271068 => 271069)
--- trunk/Source/cmake/FindHarfBuzz.cmake 2020-12-23 00:12:04 UTC (rev 271068)
+++ trunk/Source/cmake/FindHarfBuzz.cmake 2020-12-23 16:52:58 UTC (rev 271069)
@@ -107,6 +107,12 @@
pkg_check_modules(PC_HARFBUZZ_ICU QUIET harfbuzz-icu)
set(HarfBuzz_ICU_COMPILE_OPTIONS ${PC_HARFBUZZ_ICU_CFLAGS_OTHER})
+ find_path(HarfBuzz_ICU_INCLUDE_DIR
+ NAMES hb-icu.h
+ HINTS ${PC_HARFBUZZ_ICU_INCLUDEDIR} ${PC_HARFBUZZ_ICU_INCLUDE_DIRS}
+ PATH_SUFFIXES harfbuzz
+ )
+
find_library(HarfBuzz_ICU_LIBRARY
NAMES ${HarfBuzz_ICU_NAMES} harfbuzz-icu
HINTS ${PC_HARFBUZZ_ICU_LIBDIR} ${PC_HARFBUZZ_ICU_LIBRARY_DIRS}
@@ -164,12 +170,13 @@
set_target_properties(HarfBuzz::ICU PROPERTIES
IMPORTED_LOCATION "${HarfBuzz_ICU_LIBRARY}"
INTERFACE_COMPILE_OPTIONS "${HarfBuzz_ICU_COMPILE_OPTIONS}"
- INTERFACE_INCLUDE_DIRECTORIES "${HarfBuzz_INCLUDE_DIR}"
+ INTERFACE_INCLUDE_DIRECTORIES "${HarfBuzz_ICU_INCLUDE_DIR}"
)
endif ()
mark_as_advanced(
HarfBuzz_INCLUDE_DIR
+ HarfBuzz_ICU_INCLUDE_DIR
HarfBuzz_LIBRARY
HarfBuzz_ICU_LIBRARY
)
@@ -176,5 +183,5 @@
if (HarfBuzz_FOUND)
set(HarfBuzz_LIBRARIES ${HarfBuzz_LIBRARY} ${HarfBuzz_ICU_LIBRARY})
- set(HarfBuzz_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIR})
+ set(HarfBuzz_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIR} ${HarfBuzz_ICU_INCLUDE_DIR})
endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes