diff options
author | Brecht Van Lommel <brecht> | 2020-09-18 19:04:30 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-09-18 19:11:32 +0300 |
commit | 7b988188dc3f5ea05d90b8e16337147778f9f580 (patch) | |
tree | 89a138c53f6f0957f9a59946679d6b96afbfe235 /build_files/build_environment/cmake | |
parent | 007e90e8c0a9176e16e70861d87dc7f883cc78ba (diff) |
Fix T79929: crashes with Cycles denoising on older Macs
This was a bug in OpenImageDenoise, upgrade to latest 1.2.3 which has the fix.
This in turn required a newer ispc version.
Differential Revision: https://developer.blender.org/D8892
Diffstat (limited to 'build_files/build_environment/cmake')
-rw-r--r-- | build_files/build_environment/cmake/ispc.cmake | 1 | ||||
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/build_files/build_environment/cmake/ispc.cmake b/build_files/build_environment/cmake/ispc.cmake index a352f87a9aa..967be9ec2f8 100644 --- a/build_files/build_environment/cmake/ispc.cmake +++ b/build_files/build_environment/cmake/ispc.cmake @@ -43,6 +43,7 @@ set(ISPC_EXTRA_ARGS -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++ -DISPC_INCLUDE_TESTS=Off -DCLANG_LIBRARY_DIR=${LIBDIR}/clang/lib -DCLANG_INCLUDE_DIRS=${LIBDIR}/clang/include diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index cf598c5455a..48e37c93d00 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -293,9 +293,9 @@ set(USD_VERSION 20.05) set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz) set(USD_HASH 6d679e739e7f65725d9c029e37dda9fc) -set(OIDN_VERSION 1.2.1) +set(OIDN_VERSION 1.2.3) set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz) -set(OIDN_HASH cbebc1a25eb6de62af3a59e943063608) +set(OIDN_HASH 1f11466c2c3efc27faba5ec7078d12b2) set(LIBGLU_VERSION 9.0.1) set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar.xz) @@ -313,9 +313,9 @@ set(XR_OPENXR_SDK_VERSION 1.0.8) set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz) set(XR_OPENXR_SDK_HASH c6de63d2e0f9029aa58dfa97cad8ce07) -set(ISPC_VERSION v1.13.0) +set(ISPC_VERSION v1.14.1) set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz) -set(ISPC_HASH 4bf5e8d0020c4b9980faa702c1a6f25f) +set(ISPC_HASH 968fbc8dfd16a60ba4e32d2e0e03ea7a) set(GMP_VERSION 6.2.0) set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz) |