646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
21 lines
833 B
Diff
21 lines
833 B
Diff
--- src/laf/cmake/FindSkia.cmake.orig 2022-01-08 02:15:13.417619266 +0100
|
|
+++ src/laf/cmake/FindSkia.cmake 2022-01-08 02:15:43.603960491 +0100
|
|
@@ -32,14 +32,18 @@
|
|
# SkShaper module + freetype + harfbuzz
|
|
find_library(SKSHAPER_LIBRARY skshaper PATH "${SKIA_LIBRARY_DIR}")
|
|
|
|
+if(NOT USE_SHARED_FREETYPE)
|
|
set(FREETYPE_FOUND ON)
|
|
find_library(FREETYPE_LIBRARY freetype2 PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH)
|
|
set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
|
|
set(FREETYPE_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/freetype/include")
|
|
+endif()
|
|
|
|
+if(NOT USE_SHARED_HARFBUZZ)
|
|
find_library(HARFBUZZ_LIBRARY harfbuzz PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH)
|
|
set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY})
|
|
set(HARFBUZZ_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/harfbuzz/src")
|
|
+endif()
|
|
|
|
set(SKIA_LIBRARIES
|
|
${SKIA_LIBRARY}
|