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:
authorBrecht Van Lommel <brecht@blender.org>2020-06-04 16:13:47 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-06-05 01:58:31 +0300
commit0b28f0410ce5b90f75d3b5138fae2105d3ff1771 (patch)
tree8f9fe6f7b588531e14f44aba72aac07a9451cea4 /build_files/build_environment/cmake/osl.cmake
parentb168c255aae848f730a12b9cb16e88681a0c6809 (diff)
Fix make deps build errors with conflicting Boost system packages
Diffstat (limited to 'build_files/build_environment/cmake/osl.cmake')
-rw-r--r--build_files/build_environment/cmake/osl.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake
index 92032719245..3532eec144e 100644
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@ -44,6 +44,7 @@ set(OSL_EXTRA_ARGS
-DBOOST_ROOT=${LIBDIR}/boost
-DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-DBoost_NO_SYSTEM_PATHS=ON
+ -DBoost_NO_BOOST_CMAKE=ON
-DLLVM_DIRECTORY=${LIBDIR}/llvm
-DLLVM_INCLUDES=${LIBDIR}/llvm/include
-DLLVM_LIB_DIR=${LIBDIR}/llvm/lib