[Bf-blender-cvs] [31296f6f9d6] master: CMake/Linux: Fix Brotli library finding on standard distros.

[Bastien Montagne]

Commit: 31296f6f9d67570920c143be24b26e28f10a0ebb
Author: Bastien Montagne
Date:   Tue Jan 25 14:31:17 2022 +0100
Branches: master
https://developer.blender.org/rB31296f6f9d67570920c143be24b26e28f10a0ebb

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.

===================================================================

M	build_files/cmake/Modules/FindBrotli.cmake

===================================================================

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