Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hdf5 update #111

Merged
merged 2 commits into from
May 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,11 @@ OPTION(MT_BUILD_VISUAL_TOOLS "Build visual tools (Display, Register, postf, ray_
OPTION(USE_SYSTEM_ITK "Use System ITK" OFF)
OPTION(MT_USE_OPENMP "Use OpenMP multi-threading" OFF)
OPTION(MT_BUILD_IM "Build ImageMagick and dependent libraries" OFF)
OPTION(MT_BUILD_QUIET "Build quetly" OFF)
OPTION(MT_BUILD_OPENBLAS "Build OpenBLAS: will require fortran" OFF)
#OPTION(MT_USE_OPENMP_BLAS "Use Build OpenBLAS with OpenMP support" OFF) # TODO: finish this to compile on some platforms

SET(MT_PACKAGES_PATH "${CMAKE_BINARY_DIR}/cache" CACHE PATH "Directory containing 3rd party packages")

# trying to reduce verbosity
IF(MT_BUILD_QUIET)
set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
ENDIF(MT_BUILD_QUIET)

IF(MT_BUILD_LITE)
SET(MT_BUILD_ITK_TOOLS OFF)
SET(MT_BUILD_VISUAL_TOOLS OFF)
Expand Down
25 changes: 0 additions & 25 deletions cmake-modules/89af9b2694715bf8204993e032fa132f80cf37bd.patch

This file was deleted.

5 changes: 0 additions & 5 deletions cmake-modules/BuildANTS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,13 @@ macro(build_ANTS install_prefix staging_prefix itk_dir ) #boost_dir
# -DCMAKE_CXX_COMPILER:FILEPATH=${ITK_CXX_COMPILER}
)
endif()
#SET(PATCH_QUIET "")
#if(MT_BUILD_QUIET)
SET(PATCH_QUIET patch -p0 -t -N -i ${CMAKE_SOURCE_DIR}/cmake-modules/quiet_cmake_ccache.patch)
#endif(MT_BUILD_QUIET)

ExternalProject_Add(ANTS
#GIT_REPOSITORY "https://github.com/vfonov/ANTs.git"
#GIT_TAG "69d3a5a6c7125ccf07a9e9cf6ef29f0b91e9514f"
#UPDATE_COMMAND ""
SOURCE_DIR ${CMAKE_SOURCE_DIR}/ANTs
BINARY_DIR ANTS-build
#PATCH_COMMAND ${PATCH_QUIET}
LIST_SEPARATOR :::
CMAKE_GENERATOR ${CMAKE_GEN}
CMAKE_ARGS
Expand Down
6 changes: 0 additions & 6 deletions cmake-modules/BuildC3D.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ macro(build_C3D install_prefix staging_prefix)
)
endif()

#SET(PATCH_QUIET "")
#if(MT_BUILD_QUIET)
SET(PATCH_QUIET patch -p0 -t -N -i ${CMAKE_SOURCE_DIR}/cmake-modules/quiet_cmake_ccache.patch)
#endif(MT_BUILD_QUIET)

GET_PACKAGE("https://github.com/vfonov/Convert3D/archive/v0.0.tar.gz" "a9f346f14171297dc28b530590be8754" "c3d-v0.0.tar.gz" C3D_PATH )

ExternalProject_Add(C3D
Expand All @@ -65,7 +60,6 @@ macro(build_C3D install_prefix staging_prefix)
UPDATE_COMMAND ""
SOURCE_DIR C3D
BINARY_DIR C3D-build
PATCH_COMMAND ${PATCH_QUIET}
LIST_SEPARATOR :::
CMAKE_GENERATOR ${CMAKE_GEN}
CMAKE_ARGS
Expand Down
11 changes: 3 additions & 8 deletions cmake-modules/BuildHDF5.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,14 @@ macro(build_hdf5 install_prefix staging_prefix)

SET(HDF_CMAKE_CXX_FLAGS "-fPIC ${CMAKE_CXX_FLAGS}")
SET(HDF_CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")

#SET(PATCH_QUIET "")
#if(MT_BUILD_QUIET)
#SET(PATCH_QUIET patch -p0 -t -N -i ${CMAKE_SOURCE_DIR}/cmake-modules/quiet_cmake_ccache.patch)
#endif(MT_BUILD_QUIET)
GET_PACKAGE("https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2" "7c19d6b81ee2a3ba7d36f6922b2f90d3" "hdf5-1.10.5.tar.bz2" HDF5_PATH )

GET_PACKAGE("https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.6/src/hdf5-1.10.6.tar.bz2" "03095102a6118c32a75a9b9b40be66f2" "hdf5-1.10.6.tar.bz2" HDF5_PATH )

ExternalProject_Add(HDF5
URL "${HDF5_PATH}"
URL_MD5 "7c19d6b81ee2a3ba7d36f6922b2f90d3"
URL_MD5 "03095102a6118c32a75a9b9b40be66f2"
SOURCE_DIR HDF5
BINARY_DIR HDF5-build
PATCH_COMMAND ${PATCH_QUIET}
CMAKE_GENERATOR ${CMAKE_GEN}
CMAKE_ARGS
-DBUILD_TESTING:BOOL=OFF #${BUILD_TESTING}
Expand Down
8 changes: 0 additions & 8 deletions cmake-modules/BuildITKv4.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,6 @@ macro(build_itkv4 install_prefix staging_prefix minc_dir)
)
ENDIF()

SET(PATCH_QUIET "")
#if(MT_BUILD_QUIET)
IF(NOT APPLE)
SET(PATCH_QUIET patch -p0 -t -N -i ${CMAKE_SOURCE_DIR}/cmake-modules/quiet_cmake_ccache.patch)
ENDIF(NOT APPLE)
#endif(MT_BUILD_QUIET)

SET(HDF5_LIB_SUFFIX ".a")

IF(MT_BUILD_SHARED_LIBS)
Expand Down Expand Up @@ -145,7 +138,6 @@ macro(build_itkv4 install_prefix staging_prefix minc_dir)
UPDATE_COMMAND ""
SOURCE_DIR ITKv4
BINARY_DIR ITKv4-build
PATCH_COMMAND ${PATCH_QUIET}
CMAKE_GENERATOR ${CMAKE_GEN}
CMAKE_ARGS
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
Expand Down
6 changes: 0 additions & 6 deletions cmake-modules/BuildLIBLBFGS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,11 @@ macro(build_liblbfgs install_prefix staging_prefix)
)
endif()

#SET(PATCH_QUIET "")
#if(MT_BUILD_QUIET)
SET(PATCH_QUIET patch -p0 -t -N -i ${CMAKE_SOURCE_DIR}/cmake-modules/quiet_cmake_ccache.patch)
#endif(MT_BUILD_QUIET)

GET_PACKAGE("https://github.com/vfonov/liblbfgs/archive/v1.10-cmake.tar.gz" "1261b1c21eed98617e3b92019cf9b1c5" "liblbfgs-v1.10-cmake.tar.gz" LIBLBFGS_PATH )

ExternalProject_Add(LIBLBFGS
SOURCE_DIR LIBLBFGS
BINARY_DIR LIBLBFGS-build
PATCH_COMMAND ${PATCH_QUIET}
URL "${LIBLBFGS_PATH}"
URL_MD5 "1261b1c21eed98617e3b92019cf9b1c5"
CMAKE_GENERATOR ${CMAKE_GEN}
Expand Down
6 changes: 0 additions & 6 deletions cmake-modules/BuildNETCDF.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,13 @@ macro(build_netcdf install_prefix staging_prefix)
)
endif()

#SET(PATCH_QUIET "")
#if(MT_BUILD_QUIET)
# SET(PATCH_QUIET patch -p0 -t -N -i ${CMAKE_SOURCE_DIR}/cmake-modules/quiet_cmake_ccache.patch)
#endif(MT_BUILD_QUIET)

GET_PACKAGE("https://github.com/Unidata/netcdf-c/archive/v4.6.3.tar.gz" "5456da531d5e3f877e5ea328645b1e68" "netcdf-v4.6.3.tar.gz" NETCDF_PATH )

ExternalProject_Add(NETCDF
URL "${NETCDF_PATH}"
URL_MD5 "5456da531d5e3f877e5ea328645b1e68"
SOURCE_DIR NETCDF
BINARY_DIR NETCDF-build
PATCH_COMMAND ${PATCH_QUIET}
LIST_SEPARATOR :::
CMAKE_GENERATOR ${CMAKE_GEN}
CMAKE_ARGS
Expand Down
5 changes: 0 additions & 5 deletions cmake-modules/quiet_cmake.patch

This file was deleted.

10 changes: 0 additions & 10 deletions cmake-modules/quiet_cmake_ccache.patch

This file was deleted.