[Bf-blender-cvs] [f2175e06a74] master: Mae deps: Ensure Brotli is disabled for FreeType
Sergey Sharybin
noreply at git.blender.org
Tue Jul 7 12:44:16 CEST 2020
Commit: f2175e06a7455be6ec5affa42444cfae1d9c1726
Author: Sergey Sharybin
Date: Tue Jul 7 12:43:18 2020 +0200
Branches: master
https://developer.blender.org/rBf2175e06a7455be6ec5affa42444cfae1d9c1726
Mae deps: Ensure Brotli is disabled for FreeType
We don't need it and it was optionally enabled, causing Blender to fail
to link on certain configuration (when Brotli is installed via Homebrew
for example).
===================================================================
M build_files/build_environment/cmake/freetype.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/freetype.cmake b/build_files/build_environment/cmake/freetype.cmake
index 30dd2eed676..fefe2c900bc 100644
--- a/build_files/build_environment/cmake/freetype.cmake
+++ b/build_files/build_environment/cmake/freetype.cmake
@@ -24,7 +24,8 @@ set(FREETYPE_EXTRA_ARGS
-DFT_WITH_HARFBUZZ=OFF
-DFT_WITH_BZIP2=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
- -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE)
+ -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE
+ -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE)
ExternalProject_Add(external_freetype
URL ${FREETYPE_URI}
More information about the Bf-blender-cvs
mailing list