[Bf-blender-cvs] [0d2e6289647] master: Build: Point ISPC explicitly to the location of LLVM libraries.

Stefan Werner noreply at git.blender.org
Mon Jun 29 14:06:07 CEST 2020


Commit: 0d2e628964763a5ad872d51aec07bd551cbb2272
Author: Stefan Werner
Date:   Mon Jun 29 14:04:12 2020 +0200
Branches: master
https://developer.blender.org/rB0d2e628964763a5ad872d51aec07bd551cbb2272

Build: Point ISPC explicitly to the location of LLVM libraries.

Sometimes the ISPC build could pick up the system LLVM librareis
instead of the ones in the Blender lib directory.

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

M	build_files/build_environment/cmake/ispc.cmake

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

diff --git a/build_files/build_environment/cmake/ispc.cmake b/build_files/build_environment/cmake/ispc.cmake
index 1896c85bc88..0bb5db82aea 100644
--- a/build_files/build_environment/cmake/ispc.cmake
+++ b/build_files/build_environment/cmake/ispc.cmake
@@ -30,6 +30,7 @@ set(ISPC_EXTRA_ARGS
     -DISPC_INCLUDE_EXAMPLES=Off
     -DISPC_INCLUDE_TESTS=Off
     -DLLVM_ROOT=${LIBDIR}/llvm/lib/cmake/llvm
+    -DLLVM_LIBRARY_DIR=${LIBDIR}/llvm/lib
     -DCLANG_EXECUTABLE=${LIBDIR}/clang/bin/clang
     -DISPC_INCLUDE_TESTS=Off
     -DCLANG_LIBRARY_DIR=${LIBDIR}/clang/lib



More information about the Bf-blender-cvs mailing list