kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Revert "CMake: include BROTLI_LIBRARIES in FREETYPE_LIBRARIES on UNIX"

Browse Source 
This reverts commit 086f1911698154edd4cc19dc966e966bb0060917.

There was apparently a problem using APPEND which wasn't referenced
in the commit log.

Added comment noting the reason for the discrepancy.
This commit is contained in:
Campbell Barton 2022-01-26 20:47:03 +11:00
parent 0cb5eae9d0
commit b3bf46b78d
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,9 +109,14 @@ if(NOT WITH_SYSTEM_FREETYPE)
find_package_wrapper(Freetype REQUIRED) find_package_wrapper(Freetype REQUIRED)
if(EXISTS ${LIBDIR}) if(EXISTS ${LIBDIR})
find_package_wrapper(Brotli REQUIRED) 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()
endif() endif()

2
intern/ghost/test/CMakeLists.txt
View File

@ -292,7 +292,7 @@ target_link_libraries(multitest_c
guardedalloc_lib guardedalloc_lib
wcwidth_lib wcwidth_lib
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${FREETYPE_LIBRARIES} ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
${PLATFORM_LINKLIBS} ${PLATFORM_LINKLIBS}

2
source/blender/blenfont/CMakeLists.txt
View File

@ -54,7 +54,7 @@ set(LIB
bf_gpu bf_gpu
bf_intern_guardedalloc bf_intern_guardedalloc
${FREETYPE_LIBRARIES} ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES}
) )
if(WIN32) if(WIN32)

2
source/blender/blenkernel/CMakeLists.txt
View File

@ -522,7 +522,7 @@ set(LIB
bf_simulation bf_simulation
# For `vfontdata_freetype.c`. # For `vfontdata_freetype.c`.
${FREETYPE_LIBRARIES} ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES}
) )
if(WITH_BINRELOC) if(WITH_BINRELOC)