From 4c617c06e9cb924ba60a78fd5923202847f0fb2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 24 Jan 2022 15:25:05 +0100 Subject: 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. --- build_files/cmake/platform/platform_unix.cmake | 6 ++++++ 1 file changed, 6 insertions(+) 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. -- cgit v1.2.3