diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-01-21 20:26:05 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-01-21 20:26:05 +0300 |
| commit | c20f209b1c3e94f26984d8136a38ee1927ce3427 (patch) | |
| tree | 9fb705c0b60824b1f6a4e409c67e79b2d3bd43f7 /build_files/cmake | |
| parent | 59fc95bf97e70cd8daa86e9300f7e277ff2bb7b4 (diff) | |
Cmake/Deps: Freetype 2.11.0 / brotli 1.0.9
The UI team requested adding woff2 support to freetype.
this required a new dependency brotli.
This changes adds brotili to the builder and bumps
freetype to version 2.11.0
As freetype now depends on other libraries, for consistency
all use of ${FREETYPE_LIBRARY} in cmake has been updated to
use ${FREETYPE_LIBRARIES} adjustments have been made in the
windows platform file, all other platforms use cmake's
FindFreeType.cmake which already sets this variable.
reviewed by: brecht
Differential Revision: https://developer.blender.org/D13448
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 851dafc34fb..26cdde9d819 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -347,7 +347,7 @@ set(FREETYPE_INCLUDE_DIRS ${LIBDIR}/freetype/include ${LIBDIR}/freetype/include/freetype2 ) -set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib) +set(FREETYPE_LIBRARIES ${LIBDIR}/freetype/lib/freetype2ST.lib) windows_find_package(freetype REQUIRED) if(WITH_FFTW3) |