diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2021-02-09 17:06:44 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2021-02-15 14:17:08 +0300 |
| commit | 649f99b6bc9906b7b752f4b981f67bfbf3ea3e58 (patch) | |
| tree | db2cd9fe8f86675bffcea2de2a4447ad43cb9f33 /build_files/build_environment/cmake | |
| parent | 227fa68696a25adbd010b7c759e30191fa36d0c9 (diff) | |
CMake/Deps: Alembic 1.7.16
Version bump + no longer using Boost.
Building Alembic with Boost gave compiler errors, and having one less
inter-dependency is good as well.
Reviewed By: sebbas, sybren
Differential Revision: https://developer.blender.org/D10329
Diffstat (limited to 'build_files/build_environment/cmake')
| -rw-r--r-- | build_files/build_environment/cmake/alembic.cmake | 11 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/build_files/build_environment/cmake/alembic.cmake b/build_files/build_environment/cmake/alembic.cmake index 94b7b56d58f..d865382eff3 100644 --- a/build_files/build_environment/cmake/alembic.cmake +++ b/build_files/build_environment/cmake/alembic.cmake @@ -19,16 +19,6 @@ set(ALEMBIC_EXTRA_ARGS -DBUILDSTATIC=ON -DLINKSTATIC=ON - -DALEMBIC_LIB_USES_BOOST=ON - -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING} - -DBoost_USE_MULTITHREADED=ON - -DUSE_STATIC_BOOST=On - -DBoost_USE_STATIC_LIBS=ON - -DBoost_USE_STATIC_RUNTIME=OFF - -DBoost_DEBUG=ON - -DBOOST_ROOT=${LIBDIR}/boost - -DBoost_NO_SYSTEM_PATHS=ON - -DBoost_NO_BOOST_CMAKE=ON -DILMBASE_ROOT=${LIBDIR}/openexr -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/openexr/include/OpenEXR -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT} @@ -81,7 +71,6 @@ endif() add_dependencies( external_alembic - external_boost external_zlib external_openexr ) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index b335f4accc7..87c00e517db 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -78,9 +78,9 @@ set(FREEGLUT_VERSION 3.0.0) set(FREEGLUT_URI http://pilotfiber.dl.sourceforge.net/project/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz) set(FREEGLUT_HASH 90c3ca4dd9d51cf32276bc5344ec9754) -set(ALEMBIC_VERSION 1.7.12) +set(ALEMBIC_VERSION 1.7.16) set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz) -set(ALEMBIC_MD5 e2b3777f23c5c09481a008cc6f0f8a40) +set(ALEMBIC_MD5 effcc86e42fe6605588e3de57bde6677) # hash is for 3.1.2 set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c) |