diff options
| author | Campbell Barton <campbell@blender.org> | 2022-01-26 12:47:03 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-01-26 12:51:04 +0300 |
| commit | b3bf46b78daca91cc73b3f4ac43ad7e9d86a4413 (patch) | |
| tree | 4ec5d9c5134c01146bab2a7cd3cba244c76fb0f0 /build_files | |
| parent | 0cb5eae9d0617abedf745753c23061ddfcfd1416 (diff) | |
Revert "CMake: include BROTLI_LIBRARIES in FREETYPE_LIBRARIES on UNIX"
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.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 11 |
1 files changed, 8 insertions, 3 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() |