[Bf-blender-cvs] [6ce95c34ae1] master: Build: disable cairo for harfbuzz

[Campbell Barton]

Commit: 6ce95c34ae1497ab94ba61f99ed426eadc1bf85d
Author: Campbell Barton
Date:   Tue Dec 13 11:30:37 2022 +1100
Branches: master
https://developer.blender.org/rB6ce95c34ae1497ab94ba61f99ed426eadc1bf85d

Build: disable cairo for harfbuzz

This is only used for command line utilities, disable the dependency.

===================================================================

M	build_files/build_environment/cmake/harfbuzz.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/harfbuzz.cmake b/build_files/build_environment/cmake/harfbuzz.cmake
index d889e7e6cb4..3eb994f72fe 100644
--- a/build_files/build_environment/cmake/harfbuzz.cmake
+++ b/build_files/build_environment/cmake/harfbuzz.cmake
@@ -5,7 +5,7 @@ if(WIN32)
   set(HARFBUZZ_PKG_ENV FREETYPE_DIR=${LIBDIR}/freetype)
 else()
   set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV})
-  set(HARFBUZZ_PKG_ENV PKG_CONFIG_PATH=${LIBDIR}/freetype/lib/pkgconfig:${LIBDIR}/brotli/lib/pkgconfig:$PKG_CONFIG_PATH)
+  set(HARFBUZZ_PKG_ENV PKG_CONFIG_PATH=${LIBDIR}/freetype/lib/pkgconfig:${LIBDIR}/brotli/lib/pkgconfig:${LIBDIR}/lib/python3.10/pkgconfig:$PKG_CONFIG_PATH)
 endif()
 
 set(HARFBUZZ_EXTRA_OPTIONS
@@ -13,6 +13,9 @@ set(HARFBUZZ_EXTRA_OPTIONS
   -Dfreetype=enabled
   -Dglib=disabled
   -Dgobject=disabled
+  # Only used for command line utilities,
+  # disable as this would add an addition & unnecessary build-dependency.
+  -Dcairo=disabled
 )
 
 ExternalProject_Add(external_harfbuzz