diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-08-09 17:46:57 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-08-09 17:50:31 +0300 |
| commit | ff594715b8347e8d5d6a9f60e48ec7b170661962 (patch) | |
| tree | 58a7eba812164ee5843cef0c3acd11edd93c7992 /build_files/build_environment/cmake/ispc.cmake | |
| parent | 71e2c366f7d19d8fe4f160a60597e63692fdc7ca (diff) | |
Build: macOS library upgrade fixes
* Revert back to OpenMP 9.0.1 due to bug causing cloth physics test to fail.
* Skip flex build on macOS to avoid link error, only reason we build this is
due to old flex version on Linux CentOS 7.
* Fix PNG cmake argument that expects lowercase on instead of ON.
Ref T90507, T88438
Diffstat (limited to 'build_files/build_environment/cmake/ispc.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/ispc.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/build_environment/cmake/ispc.cmake b/build_files/build_environment/cmake/ispc.cmake index 93fc9dc4846..b1cd2cea0c7 100644 --- a/build_files/build_environment/cmake/ispc.cmake +++ b/build_files/build_environment/cmake/ispc.cmake @@ -29,13 +29,13 @@ elseif(APPLE) if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64") set(ISPC_EXTRA_ARGS_APPLE -DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison - -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex + -DFLEX_EXECUTABLE=/opt/homebrew/opt/flex/bin/flex -DARM_ENABLED=On ) else() set(ISPC_EXTRA_ARGS_APPLE -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison - -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex + -DFLEX_EXECUTABLE=/usr/local/opt/flex/bin/flex -DARM_ENABLED=Off ) endif() @@ -84,7 +84,7 @@ if(WIN32) external_ispc external_flexbison ) -else() +elseif(UNIX AND NOT APPLE) add_dependencies( external_ispc external_flex |