[Bf-blender-cvs] [847da6176e3] master: Fix finding system Haru library on Debian.

Bastien Montagne noreply at git.blender.org
Thu Feb 11 20:29:51 CET 2021


Commit: 847da6176e3906d2b8b562777948ffa4dbb9e8fa
Author: Bastien Montagne
Date:   Thu Feb 11 20:28:10 2021 +0100
Branches: master
https://developer.blender.org/rB847da6176e3906d2b8b562777948ffa4dbb9e8fa

Fix finding system Haru library on Debian.

Paths and names of system packages-installed libhpdf on Debian (and
probably its derived distributions?) are slightly different than what
was given to CMake finding script.

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

M	build_files/cmake/Modules/FindHaru.cmake

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

diff --git a/build_files/cmake/Modules/FindHaru.cmake b/build_files/cmake/Modules/FindHaru.cmake
index 5774f83b8c5..7db57a6adfb 100644
--- a/build_files/cmake/Modules/FindHaru.cmake
+++ b/build_files/cmake/Modules/FindHaru.cmake
@@ -35,11 +35,13 @@ find_path(HARU_INCLUDE_DIR
     ${_haru_SEARCH_DIRS}
   PATH_SUFFIXES
     include/haru
+    include
 )
 
 find_library(HARU_LIBRARY
   NAMES
     hpdfs
+    hpdf
   HINTS
     ${_haru_SEARCH_DIRS}
   PATH_SUFFIXES



More information about the Bf-blender-cvs mailing list