diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-06-15 12:55:40 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-06-15 12:58:58 +0300 |
commit | 0102b9d47edfeea003adf7eec3077425ff065d6e (patch) | |
tree | e6f244fb1229c488bbdc8f2389cf56ea823a2852 /build_files | |
parent | 76ebc608af7a89d2e9919d67ec6b639d47f70c1a (diff) |
Alembic: remove HDF5 support from CMake files
This is a follup to 0c384362272.
No functional changes to Blender, just the build scripts.
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/build_environment/cmake/alembic.cmake | 12 | ||||
-rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 9 | ||||
-rw-r--r-- | build_files/build_environment/cmake/hdf5.cmake | 42 | ||||
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 | ||||
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 1 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindHDF5.cmake | 65 | ||||
-rw-r--r-- | build_files/cmake/macros.cmake | 1 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 8 |
8 files changed, 1 insertions, 141 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 diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 9acafe8f8e6..a7685f87c8d 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -49,15 +49,6 @@ if(BUILD_MODE STREQUAL Release) ) endif() -if(BUILD_MODE STREQUAL Debug) - add_custom_target(Harvest_Debug_Results - COMMAND - # hdf5 - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib && - DEPENDS Package_Python - ) -endif() - else(WIN32) function(harvest from to) diff --git a/build_files/build_environment/cmake/hdf5.cmake b/build_files/build_environment/cmake/hdf5.cmake deleted file mode 100644 index e28903059f2..00000000000 --- a/build_files/build_environment/cmake/hdf5.cmake +++ /dev/null @@ -1,42 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# ***** END GPL LICENSE BLOCK ***** - -set(HDF5_EXTRA_ARGS - -DHDF5_ENABLE_THREADSAFE=Off - -DHDF5_BUILD_CPP_LIB=Off - -DBUILD_TESTING=Off - -DHDF5_BUILD_TOOLS=Off - -DHDF5_BUILD_EXAMPLES=Off - -DHDF5_BUILD_HL_LIB=On - -DBUILD_STATIC_CRT_LIBS=On - -DBUILD_SHARED_LIBS=On -) - -if(WIN32) - set(HDF5_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/hdf5/src/external_hdf5 < ${PATCH_DIR}/hdf5.diff) -endif() - -ExternalProject_Add(external_hdf5 - URL ${HDF5_URI} - DOWNLOAD_DIR ${DOWNLOAD_DIR} - URL_HASH MD5=${HDF5_HASH} - PREFIX ${BUILD_DIR}/hdf5 - PATCH_COMMAND ${HDF5_PATCH} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS} - INSTALL_DIR ${LIBDIR}/hdf5 -) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 338026e4d6c..868bca44d4f 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -78,10 +78,6 @@ 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(HDF5_VERSION 1.8.17) -set(HDF5_URI https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${HDF5_VERSION}/src/hdf5-${HDF5_VERSION}.tar.gz) -set(HDF5_HASH 7d572f8f3b798a628b8245af0391a0ca) - set(ALEMBIC_VERSION 1.7.12) set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz) set(ALEMBIC_MD5 e2b3777f23c5c09481a008cc6f0f8a40) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 24156f3e2ca..68ebed2dbf7 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -3892,7 +3892,6 @@ install_DEB() { INFO "Forced Alembic building, as requested..." compile_ALEMBIC else - # No package currently, only HDF5! compile_ALEMBIC fi diff --git a/build_files/cmake/Modules/FindHDF5.cmake b/build_files/cmake/Modules/FindHDF5.cmake deleted file mode 100644 index ea77c5d7826..00000000000 --- a/build_files/cmake/Modules/FindHDF5.cmake +++ /dev/null @@ -1,65 +0,0 @@ -# - Find HDF5 library -# Find the native HDF5 includes and libraries -# This module defines -# HDF5_INCLUDE_DIRS, where to find hdf5.h, Set when HDF5_INCLUDE_DIR is found. -# HDF5_LIBRARIES, libraries to link against to use HDF5. -# HDF5_ROOT_DIR, The base directory to search for HDF5. -# This can also be an environment variable. -# HDF5_FOUND, If false, do not try to use HDF5. -# - -#============================================================================= -# Copyright 2016 Blender Foundation. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= - -# If HDF5_ROOT_DIR was defined in the environment, use it. -IF(NOT HDF5_ROOT_DIR AND NOT $ENV{HDF5_ROOT_DIR} STREQUAL "") - SET(HDF5_ROOT_DIR $ENV{HDF5_ROOT_DIR}) -ENDIF() - -SET(_hdf5_SEARCH_DIRS - ${HDF5_ROOT_DIR} - /opt/lib/hdf5 -) - -FIND_LIBRARY(HDF5_LIBRARY - NAMES - hdf5 - HINTS - ${_hdf5_SEARCH_DIRS} - PATH_SUFFIXES - lib64 lib -) - -FIND_PATH(HDF5_INCLUDE_DIR - NAMES - hdf5.h - HINTS - ${_hdf5_SEARCH_DIRS} - PATH_SUFFIXES - include -) - -# handle the QUIETLY and REQUIRED arguments and set HDF5_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(HDF5 DEFAULT_MSG HDF5_LIBRARY HDF5_INCLUDE_DIR) - -IF(HDF5_FOUND) - SET(HDF5_LIBRARIES ${HDF5_LIBRARY}) - SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR}) -ENDIF(HDF5_FOUND) - -MARK_AS_ADVANCED( - HDF5_INCLUDE_DIR - HDF5_LIBRARY -) - -UNSET(_hdf5_SEARCH_DIRS) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index a906dbc0bf4..efe05d0bf5f 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -437,7 +437,6 @@ function(SETUP_LIBDIRS) if(WITH_ALEMBIC) link_directories(${ALEMBIC_LIBPATH}) - link_directories(${HDF5_LIBPATH}) endif() if(WITH_GHOST_WAYLAND) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 6e00a2dec7b..96244b65f21 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -265,14 +265,8 @@ endif() if(WITH_ALEMBIC) find_package_wrapper(Alembic) - if(WITH_ALEMBIC_HDF5) - set(HDF5_ROOT_DIR ${LIBDIR}/hdf5) - find_package_wrapper(HDF5) - endif() - - if(NOT ALEMBIC_FOUND OR (WITH_ALEMBIC_HDF5 AND NOT HDF5_FOUND)) + if(NOT ALEMBIC_FOUND) set(WITH_ALEMBIC OFF) - set(WITH_ALEMBIC_HDF5 OFF) endif() endif() |