diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2021-07-27 11:15:31 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2021-07-27 11:15:31 +0300 |
commit | c5e5ac4a176e7d7fc80bf9d997d0d472f4956895 (patch) | |
tree | f869a6fee740f3a5d3868f14a7d40a2e6b3e635f /build_files/build_environment/CMakeLists.txt | |
parent | 5a07174ce3c3de0497b55678901aede2024eef40 (diff) |
Deps builder: OIIO/OSL/ISPC/OIDN/LLVM/Flex updates
This diff somewhat snowballed out of updating OIDN to 1.4.1 it had some
changes that allowed us to remove the arm hacks we had in place and
revert to using identical versions for a whole bunch of deps. But that
required an update to ISPC which needed a newer LLVM and if we're
updating LLVM we may as well update OSL, and when we update OSL, OIIO
may as well be dragged in soo......anyhow...
This diff updates:
LLVM 9.0.0 (11.0.1 for mac/arm) -> 12.0.0
OIIO 2.1.15.0 -> 2.2.15.1
OSL 1.11.10.0 -> 1.11.14.1
winflex_bison 2.5.5-> 2.5.24 (ispc needed newer bison, windows only dep)
OIDN 1.4.0 -> 1.4.1
ISPC v1.14.1(random hash for mac/arm) -> v1.16.0
Flex 2.6.4 (ISPC needed newer Flex than available on CentOS 7)
and removes most of the "special arm/mac" versions. I think just ssl and
embree are left with special versions.
notable changes:
@LazyDodo included some clang headers in the linux/mac harvest which are
needed to start writing custom clang based tooling like D9465 these were
already shipping on windows, but not the other platforms.
[macOS] Change the `LC_ID_DYLIB` of OpenMP for {D11997}. This changes
where the executables look for dylibs.
Reviewed By: sebbas, LazyDodo
Differential Revision: https://developer.blender.org/D11748
Diffstat (limited to 'build_files/build_environment/CMakeLists.txt')
-rw-r--r-- | build_files/build_environment/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index 8c739dcd68e..3a9574b4b2a 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -82,7 +82,11 @@ if(UNIX) endif() include(cmake/openimageio.cmake) include(cmake/tiff.cmake) -include(cmake/flexbison.cmake) +if(WIN32) + include(cmake/flexbison.cmake) +else() + include(cmake/flex.cmake) +endif() include(cmake/osl.cmake) include(cmake/tbb.cmake) include(cmake/openvdb.cmake) |