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:
authorRay Molenkamp <github@lazydodo.com>2022-06-17 18:38:25 +0300
committerRay Molenkamp <github@lazydodo.com>2022-06-17 18:38:25 +0300
commit9bae9d97b105855de2d6f73d28e81fd6be77a48a (patch)
tree3c5a80f03449b27ed40a8feb5f4bf0215d9f16df /build_files/build_environment/cmake
parentd86af604290be0507db113dc8c82540bb30d4fd3 (diff)
deps: fix llvm using system python
llvm was using system python, rather than our copy this went unnoticed on both linux and windows until sergey tried to build the deps on a clean system with no system python installed.
Diffstat (limited to 'build_files/build_environment/cmake')
-rw-r--r--build_files/build_environment/cmake/llvm.cmake9
1 files changed, 9 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/llvm.cmake b/build_files/build_environment/cmake/llvm.cmake
index cf92a5175a3..df4cd8b71e9 100644
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -25,11 +25,14 @@ set(LLVM_EXTRA_ARGS
-DLLVM_BUILD_LLVM_C_DYLIB=OFF
-DLLVM_ENABLE_UNWIND_TABLES=OFF
-DLLVM_ENABLE_PROJECTS=clang${LLVM_BUILD_CLANG_TOOLS_EXTRA}
+ -DPython3_ROOT_DIR=${LIBDIR}/python/
+ -DPython3_EXECUTABLE=${PYTHON_BINARY}
${LLVM_XML2_ARGS}
)
if(WIN32)
set(LLVM_GENERATOR "Ninja")
+ list(APPEND LLVM_EXTRA_ARGS -DPython3_FIND_REGISTRY=NEVER)
else()
set(LLVM_GENERATOR "Unix Makefiles")
endif()
@@ -74,3 +77,9 @@ if(APPLE)
external_xml2
)
endif()
+
+add_dependencies(
+ ll
+ external_python
+)
+