diff options
| author | Julian Eisel <julian@blender.org> | 2020-06-16 12:31:33 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-06-16 12:31:33 +0300 |
| commit | cfde6ebf450594faa57c4bfeaecff10fe512c91b (patch) | |
| tree | 7fb4059f2575c720e8a5a5c19e6c5bd6441dc300 /build_files/build_environment/cmake/alembic.cmake | |
| parent | 5e50380ddc99dd8c8c8067482b2dce186e7c3fb4 (diff) | |
| parent | d2587f6f930cd858c0d646c2bdd5242ed2506cdf (diff) | |
Merge branch 'master' into asset-uuid
Diffstat (limited to 'build_files/build_environment/cmake/alembic.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/alembic.cmake | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/build_files/build_environment/cmake/alembic.cmake b/build_files/build_environment/cmake/alembic.cmake index 95a461c64b3..94b7b56d58f 100644 --- a/build_files/build_environment/cmake/alembic.cmake +++ b/build_files/build_environment/cmake/alembic.cmake @@ -16,16 +16,6 @@ # # ***** END GPL LICENSE BLOCK ***** -if(ALEMBIC_HDF5) - set(ALEMBIC_HDF5_HL) - # in debug mode we do not build HDF5_hdf5_hl_LIBRARY which makes cmake really - # unhappy, stub it with the debug mode lib. it's not linking it in at this - # point in time anyhow - if(BUILD_MODE STREQUAL Debug) - set(ALEMBIC_HDF5_HL -DHDF5_hdf5_hl_LIBRARY=${LIBDIR}/hdf5/lib/libhdf5_hl_D.${LIBEXT}) - endif() -endif() - set(ALEMBIC_EXTRA_ARGS -DBUILDSTATIC=ON -DLINKSTATIC=ON @@ -53,7 +43,6 @@ set(ALEMBIC_EXTRA_ARGS -DUSE_PRMAN=0 -DUSE_HDF5=Off -DUSE_STATIC_HDF5=Off - -DHDF5_ROOT=${LIBDIR}/hdf5 -DUSE_TESTS=Off -DALEMBIC_NO_OPENGL=1 -DUSE_BINARIES=ON @@ -62,7 +51,6 @@ set(ALEMBIC_EXTRA_ARGS -DGLUT_INCLUDE_DIR="" -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/ - ${ALEMBIC_HDF5_HL} ) ExternalProject_Add(external_alembic |