tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Linux/CMake: link `libbbrotli*.a` along with new FreeType 

Add `libbrotlidec-static.a` and `libbrotlicommon-static.a` to the CMake
`$FREETYPE_LIBRARIES` variable; they'll be required when the Linux libs
for the FreeType upgrade lands (D13448).

The order of libraries is different compared to the similar lines in the
Windows and Apple CMake files, to prevent linker errors on Linux.
This commit is contained in:
Sybren A. Stüvel 2022-01-24 15:25:05 +01:00
parent 796ef560b4
commit 4c617c06e9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/cmake/platform/platform_unix.cmake
View File

@ -100,7 +100,13 @@ find_package_wrapper(JPEG REQUIRED)
find_package_wrapper(PNG REQUIRED)
find_package_wrapper(ZLIB REQUIRED)
find_package_wrapper(Zstd REQUIRED)
# FreeType compiled with Brotli compression for woff2.
find_package_wrapper(Freetype REQUIRED)
list(APPEND FREETYPE_LIBRARIES
${LIBDIR}/brotli/lib/libbrotlidec-static.a
${LIBDIR}/brotli/lib/libbrotlicommon-static.a
)
if(WITH_PYTHON)
# No way to set py35, remove for now.