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:
Diffstat (limited to 'build_files/build_environment/cmake/ispc.cmake')
-rw-r--r--build_files/build_environment/cmake/ispc.cmake13
1 files changed, 6 insertions, 7 deletions
diff --git a/build_files/build_environment/cmake/ispc.cmake b/build_files/build_environment/cmake/ispc.cmake
index 440f6e5bace..58e3873097d 100644
--- a/build_files/build_environment/cmake/ispc.cmake
+++ b/build_files/build_environment/cmake/ispc.cmake
@@ -39,8 +39,8 @@ elseif(APPLE)
endif()
elseif(UNIX)
set(ISPC_EXTRA_ARGS_UNIX
- -DCMAKE_C_COMPILER=${LIBDIR}/clang/bin/clang
- -DCMAKE_CXX_COMPILER=${LIBDIR}/clang/bin/clang++
+ -DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang
+ -DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++
-DARM_ENABLED=Off
)
endif()
@@ -51,11 +51,11 @@ set(ISPC_EXTRA_ARGS
-DISPC_INCLUDE_TESTS=Off
-DLLVM_ROOT=${LIBDIR}/llvm/lib/cmake/llvm
-DLLVM_LIBRARY_DIR=${LIBDIR}/llvm/lib
- -DCLANG_EXECUTABLE=${LIBDIR}/clang/bin/clang
- -DCLANGPP_EXECUTABLE=${LIBDIR}/clang/bin/clang++
+ -DCLANG_EXECUTABLE=${LIBDIR}/llvm/bin/clang
+ -DCLANGPP_EXECUTABLE=${LIBDIR}/llvm/bin/clang++
-DISPC_INCLUDE_TESTS=Off
- -DCLANG_LIBRARY_DIR=${LIBDIR}/clang/lib
- -DCLANG_INCLUDE_DIRS=${LIBDIR}/clang/include
+ -DCLANG_LIBRARY_DIR=${LIBDIR}/llvm/lib
+ -DCLANG_INCLUDE_DIRS=${LIBDIR}/llvm/include
${ISPC_EXTRA_ARGS_WIN}
${ISPC_EXTRA_ARGS_APPLE}
${ISPC_EXTRA_ARGS_UNIX}
@@ -74,7 +74,6 @@ ExternalProject_Add(external_ispc
add_dependencies(
external_ispc
ll
- external_clang
)
if(WIN32)