diff options
| author | Campbell Barton <campbell@blender.org> | 2022-01-26 07:34:54 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-01-26 08:00:55 +0300 |
| commit | 086f1911698154edd4cc19dc966e966bb0060917 (patch) | |
| tree | 26e3e461ecf4fbde5c1987b887aea5f0eab80fe6 | |
| parent | 4c951bfa829ed123b57c33e7821569f283658fd9 (diff) | |
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.
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 3 | ||||
| -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, 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) |