diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-02-15 19:30:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-02-15 22:22:34 +0300 |
commit | ae370e292af2f7092db02301e9deb6dd9d7a1441 (patch) | |
tree | 272ebe450b2b93c8a01f3fd2e72fd37f224da792 /build_files/build_environment/cmake/versions.cmake | |
parent | 4ce57f6eb82c0c6d3a23201c8df008d29b18b5f7 (diff) |
macOS: add Embree, OpenImageDenoise and sse2neon libraries for ARM
This required using a fork of Embree, newer LLVM version, unreleased ISPC
version and sse2neon directly from Git. Hopefully over time all the required
changes end up in official releases. For now we deviate from other platforms.
Based on contributions by Apple and Stefan Werner.
Ref D9527, D8237, T78710
Diffstat (limited to 'build_files/build_environment/cmake/versions.cmake')
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 51 |
1 files changed, 39 insertions, 12 deletions
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 4a879c793a1..361c9fd9843 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -113,18 +113,35 @@ set(OPENCOLORIO_VERSION 2.0.0) set(OPENCOLORIO_URI https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz) set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0) -set(LLVM_VERSION 9.0.1) -set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz) -set(LLVM_HASH 31eb9ce73dd2a0f8dcab8319fb03f8fc) +if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")) + # Newer version required by ISPC with arm support. + set(LLVM_VERSION 11.0.1) + set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz) + set(LLVM_HASH 6ec7ae9fd43da9b87cda15b3ab9cc7af) -set(CLANG_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-${LLVM_VERSION}.src.tar.xz) -set(CLANG_HASH 13468e4a44940efef1b75e8641752f90) + set(CLANG_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-${LLVM_VERSION}.src.tar.xz) + set(CLANG_HASH b4cb0b74b1f3292a89c9720f3e1e2934) -set(CLANG_TOOLS_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-tools-extra-${LLVM_VERSION}.src.tar.xz) -set(CLANG_TOOLS_HASH c76293870b564c6a7968622b475b7646) + set(CLANG_TOOLS_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-tools-extra-${LLVM_VERSION}.src.tar.xz) + set(CLANG_TOOLS_HASH 1e577a85948a0f07483b7c405e59a0ca) -set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz) -set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf) + set(OPENMP_VERSION 9.0.1) + set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz) + set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf) +else() + set(LLVM_VERSION 9.0.1) + set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz) + set(LLVM_HASH 31eb9ce73dd2a0f8dcab8319fb03f8fc) + + set(CLANG_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-${LLVM_VERSION}.src.tar.xz) + set(CLANG_HASH 13468e4a44940efef1b75e8641752f90) + + set(CLANG_TOOLS_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-tools-extra-${LLVM_VERSION}.src.tar.xz) + set(CLANG_TOOLS_HASH c76293870b564c6a7968622b475b7646) + + set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz) + set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf) +endif() set(OPENIMAGEIO_VERSION 2.1.15.0) set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz) @@ -296,6 +313,7 @@ set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7) set(EMBREE_VERSION 3.10.0) set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip) set(EMBREE_HASH 4bbe29e7eaa46417efc75fc5f1e8eb87) +set(EMBREE_ARM_GIT https://github.com/brechtvl/embree.git) set(USD_VERSION 21.02) set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz) @@ -321,9 +339,15 @@ set(XR_OPENXR_SDK_VERSION 1.0.14) set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz) set(XR_OPENXR_SDK_HASH 0df6b2fd6045423451a77ff6bc3e1a75) -set(ISPC_VERSION v1.14.1) -set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz) -set(ISPC_HASH 968fbc8dfd16a60ba4e32d2e0e03ea7a) +if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")) + # Unreleased version with macOS arm support. + set(ISPC_URI https://github.com/ispc/ispc/archive/f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip) + set(ISPC_HASH d382fea18d01dbd0cd05d9e1ede36d7d) +else() + set(ISPC_VERSION v1.14.1) + set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz) + set(ISPC_HASH 968fbc8dfd16a60ba4e32d2e0e03ea7a) +endif() set(GMP_VERSION 6.2.0) set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz) @@ -336,3 +360,6 @@ set(POTRACE_HASH 5f0bd87ddd9a620b0c4e65652ef93d69) set(HARU_VERSION 2_3_0) set(HARU_URI https://github.com/libharu/libharu/archive/RELEASE_${HARU_VERSION}.tar.gz) set(HARU_HASH 4f916aa49c3069b3a10850013c507460) + +set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git) +set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525) |