diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-03-29 16:36:01 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-03-29 16:36:01 +0300 |
| commit | 11130970c6a3ff14cb4dd0caece2137891b43e87 (patch) | |
| tree | b21d79b38e4ee28ed9762973e8ea1cc604dcfd1b /build_files | |
| parent | f6ad53804099802ab3f5eafa830f95f8545eb888 (diff) | |
| parent | ca5f3dd2200725712a665705fc25e20a208d6295 (diff) | |
Merge commit 'origin/master^' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index 885133f970c..f177560c5f6 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -58,7 +58,6 @@ include(cmake/openexr.cmake) include(cmake/freetype.cmake) include(cmake/freeglut.cmake) include(cmake/glew.cmake) -include(cmake/hdf5.cmake) include(cmake/alembic.cmake) include(cmake/glfw.cmake) include(cmake/clew.cmake) diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index f23939a7ba6..9ebd5206d27 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -102,8 +102,6 @@ if(BUILD_MODE STREQUAL Release) ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ && # alembic ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic && - # hdf5 - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5 ${HARVEST_TARGET}/hdf5 && # BlendThumb ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb64/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb64.dll && ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb32/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb.dll && |