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:
authorSebastián Barschkis <sebbas@sebbas.org>2021-02-26 19:37:51 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2021-02-26 19:38:14 +0300
commitfb7751f3e6c3cc5295c1eb4004e2125ffd4e08de (patch)
treee247080d315bc03ade1d0d6c57165ffde74cd5d0 /build_files/build_environment/cmake/ispc.cmake
parentcd388ef2f11d85ac6fc5382cab18e33cd0bd5a59 (diff)
CMake/deps: Fix LLVM and OSL builds
This commit is addition to D10212. Apple arm64 support was left out in that patch.
Diffstat (limited to 'build_files/build_environment/cmake/ispc.cmake')
-rw-r--r--build_files/build_environment/cmake/ispc.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/ispc.cmake b/build_files/build_environment/cmake/ispc.cmake
index 58e3873097d..dd6cf5a7d40 100644
--- a/build_files/build_environment/cmake/ispc.cmake
+++ b/build_files/build_environment/cmake/ispc.cmake
@@ -24,11 +24,12 @@ if(WIN32)
-DARM_ENABLED=Off
)
elseif(APPLE)
- # Use bison installed via Homebrew.
- # The one which comes which Xcode toolset is too old.
+ # Use bison and flex installed via Homebrew.
+ # The ones that come with Xcode toolset are too old.
if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
set(ISPC_EXTRA_ARGS_APPLE
-DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison
+ -DFLEX_EXECUTABLE=/opt/homebrew/opt/flex/bin/flex
-DARM_ENABLED=On
)
else()