diff options
-rw-r--r-- | build_files/cmake/Modules/FindBrotli.cmake | 77 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 5 | ||||
-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 |
5 files changed, 81 insertions, 7 deletions
diff --git a/build_files/cmake/Modules/FindBrotli.cmake b/build_files/cmake/Modules/FindBrotli.cmake new file mode 100644 index 00000000000..cdb45de31dd --- /dev/null +++ b/build_files/cmake/Modules/FindBrotli.cmake @@ -0,0 +1,77 @@ +# - Find Brotli library (compression for freetype/woff2). +# This module defines +# BROTLI_INCLUDE_DIRS, where to find Brotli headers, Set when +# BROTLI_INCLUDE_DIR is found. +# BROTLI_LIBRARIES, libraries to link against to use Brotli. +# BROTLI_ROOT_DIR, The base directory to search for Brotli. +# This can also be an environment variable. +# BROTLI_FOUND, If false, do not try to use Brotli. +# + +#============================================================================= +# Copyright 2022 Blender Foundation. +# +# Distributed under the OSI-approved BSD 3-Clause License, +# see accompanying file BSD-3-Clause-license.txt for details. +#============================================================================= + +# If BROTLI_ROOT_DIR was defined in the environment, use it. +IF(NOT BROTLI_ROOT_DIR AND NOT $ENV{BROTLI_ROOT_DIR} STREQUAL "") + SET(BROTLI_ROOT_DIR $ENV{BROTLI_ROOT_DIR}) +ENDIF() + +SET(_BROTLI_SEARCH_DIRS + ${BROTLI_ROOT_DIR} +) + +FIND_PATH(BROTLI_INCLUDE_DIR + NAMES + brotli/decode.h + HINTS + ${_BROTLI_SEARCH_DIRS} + PATH_SUFFIXES + include + DOC "Brotli header files" +) + +FIND_LIBRARY(BROTLI_LIBRARY_COMMON + NAMES + brotlicommon-static + HINTS + ${_BROTLI_SEARCH_DIRS} + PATH_SUFFIXES + lib64 lib lib/static + DOC "Brotli static common library" +) +FIND_LIBRARY(BROTLI_LIBRARY_DEC + NAMES + brotlidec-static + HINTS + ${_BROTLI_SEARCH_DIRS} + PATH_SUFFIXES + lib64 lib lib/static + DOC "Brotli static decode library" +) + + +IF(${BROTLI_LIBRARY_COMMON_NOTFOUND} or ${BROTLI_LIBRARY_DEC_NOTFOUND}) + set(BROTLI_FOUND FALSE) +ELSE() + # handle the QUIETLY and REQUIRED arguments and set BROTLI_FOUND to TRUE if + # all listed variables are TRUE + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Brotli DEFAULT_MSG BROTLI_LIBRARY_COMMON BROTLI_LIBRARY_DEC BROTLI_INCLUDE_DIR) + + IF(BROTLI_FOUND) + get_filename_component(BROTLI_LIBRARY_DIR ${BROTLI_LIBRARY_COMMON} DIRECTORY) + SET(BROTLI_INCLUDE_DIRS ${BROTLI_INCLUDE_DIR}) + SET(BROTLI_LIBRARIES ${BROTLI_LIBRARY_DEC} ${BROTLI_LIBRARY_COMMON}) + ENDIF() +ENDIF() + +MARK_AS_ADVANCED( + BROTLI_INCLUDE_DIR + BROTLI_LIBRARY_DIR +) + +UNSET(_BROTLI_SEARCH_DIRS) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 5aace62211c..593f3b7043c 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -103,10 +103,7 @@ find_package_wrapper(Zstd REQUIRED) # FreeType compiled with Brotli compression for woff2. find_package_wrapper(Freetype REQUIRED) -list(APPEND FREETYPE_LIBRARIES - ${LIBDIR}/brotli/lib/libbrotlidec-static.a - ${LIBDIR}/brotli/lib/libbrotlicommon-static.a -) +find_package_wrapper(Brotli REQUIRED) if(WITH_PYTHON) # No way to set py35, remove for now. 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) |