diff options
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 11 | ||||
-rw-r--r-- | intern/ghost/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/blenfont/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 261a794b5c8..6d595865659 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -109,9 +109,14 @@ if(NOT WITH_SYSTEM_FREETYPE) find_package_wrapper(Freetype REQUIRED) if(EXISTS ${LIBDIR}) find_package_wrapper(Brotli REQUIRED) - list(APPEND FREETYPE_LIBRARIES - ${BROTLI_LIBRARIES} - ) + + # NOTE: This is done on WIN32 & APPLE but fails on some Linux systems. + # See: https://devtalk.blender.org/t/22536 + # So `BROTLI_LIBRARIES` need to be added `FREETYPE_LIBRARIES`. + # + # list(APPEND FREETYPE_LIBRARIES + # ${BROTLI_LIBRARIES} + # ) endif() endif() diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index acd0da8785e..c564085c774 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -292,7 +292,7 @@ target_link_libraries(multitest_c guardedalloc_lib wcwidth_lib ${OPENGL_gl_LIBRARY} - ${FREETYPE_LIBRARIES} + ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} ${PLATFORM_LINKLIBS} diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index b1453b243c0..dd22bc2e7e0 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -54,7 +54,7 @@ set(LIB bf_gpu bf_intern_guardedalloc - ${FREETYPE_LIBRARIES} + ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES} ) if(WIN32) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 358ae934088..41ca8084849 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -522,7 +522,7 @@ set(LIB bf_simulation # For `vfontdata_freetype.c`. - ${FREETYPE_LIBRARIES} + ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES} ) if(WITH_BINRELOC) |