Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2022-01-25 16:31:17 +0300
committerBastien Montagne <bastien@blender.org>2022-01-25 16:34:33 +0300
commit31296f6f9d67570920c143be24b26e28f10a0ebb (patch)
treeb4ae747065fce224aa5cfb620c6b517570a01f0a /build_files
parent0f89bcdbebf5094bd816318774b67c677790ea99 (diff)
CMake/Linux: Fix Brotli library finding on standard distros.
Brotli seems to add a custom postfix to its static libraries by default, but in Debian at least libraries are just named the same for both shared and static versions, as usual. So add standard name after static-specific ones. Follow-up to rB4c617c06e9cb and rBa000de7c2a4d.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/Modules/FindBrotli.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/build_files/cmake/Modules/FindBrotli.cmake b/build_files/cmake/Modules/FindBrotli.cmake
index cdb45de31dd..7460a87b14a 100644
--- a/build_files/cmake/Modules/FindBrotli.cmake
+++ b/build_files/cmake/Modules/FindBrotli.cmake
@@ -36,7 +36,9 @@ FIND_PATH(BROTLI_INCLUDE_DIR
FIND_LIBRARY(BROTLI_LIBRARY_COMMON
NAMES
+ # Some builds use a special `-static` postfix in their static libraries names.
brotlicommon-static
+ brotlicommon
HINTS
${_BROTLI_SEARCH_DIRS}
PATH_SUFFIXES
@@ -45,7 +47,9 @@ FIND_LIBRARY(BROTLI_LIBRARY_COMMON
)
FIND_LIBRARY(BROTLI_LIBRARY_DEC
NAMES
+ # Some builds use a special `-static` postfix in their static libraries names.
brotlidec-static
+ brotlidec
HINTS
${_BROTLI_SEARCH_DIRS}
PATH_SUFFIXES