From 086f1911698154edd4cc19dc966e966bb0060917 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Wed, 26 Jan 2022 15:34:54 +1100
Subject: CMake: include BROTLI_LIBRARIES in FREETYPE_LIBRARIES on UNIX

This was already done for APPLE & WIN32, which would
reference these libraries twice.

Now append BROTLI_LIBRARIES to FREETYPE_LIBRARIES when they're
required for linking.

No functional changes as all references to FREETYPE_LIBRARIES also
used BROTLI_LIBRARIES.
---
 build_files/cmake/platform/platform_unix.cmake | 3 +++
 intern/ghost/test/CMakeLists.txt               | 2 +-
 source/blender/blenfont/CMakeLists.txt         | 2 +-
 source/blender/blenkernel/CMakeLists.txt       | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index c5a9017f025..261a794b5c8 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -109,6 +109,9 @@ if(NOT WITH_SYSTEM_FREETYPE)
   find_package_wrapper(Freetype REQUIRED)
   if(EXISTS ${LIBDIR})
     find_package_wrapper(Brotli REQUIRED)
+    list(APPEND FREETYPE_LIBRARIES
+      ${BROTLI_LIBRARIES}
+    )
   endif()
 endif()
 
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt
index c564085c774..acd0da8785e 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} ${BROTLI_LIBRARIES}
+  ${FREETYPE_LIBRARIES}
   ${ZLIB_LIBRARIES}
   ${CMAKE_DL_LIBS}
   ${PLATFORM_LINKLIBS}
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
index dd22bc2e7e0..b1453b243c0 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} ${BROTLI_LIBRARIES}
+  ${FREETYPE_LIBRARIES}
 )
 
 if(WIN32)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 41ca8084849..358ae934088 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} ${BROTLI_LIBRARIES}
+  ${FREETYPE_LIBRARIES}
 )
 
 if(WITH_BINRELOC)
-- 
cgit v1.2.3