diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2022-01-24 17:25:05 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2022-01-24 17:44:03 +0300 |
| commit | 4c617c06e9cb924ba60a78fd5923202847f0fb2b (patch) | |
| tree | e5977fb25042127e995d026b50a6fbd220c43924 /build_files | |
| parent | 796ef560b48cec5e22d4bb562ce695ad7a91e321 (diff) | |
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.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index b6da737af71..5aace62211c 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -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. |