diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cb9a88a..b9a11b85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/cmake-modules/89af9b2694715bf8204993e032fa132f80cf37bd.patch b/cmake-modules/89af9b2694715bf8204993e032fa132f80cf37bd.patch deleted file mode 100644 index 63c1bd7f..00000000 --- a/cmake-modules/89af9b2694715bf8204993e032fa132f80cf37bd.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 89af9b2694715bf8204993e032fa132f80cf37bd Mon Sep 17 00:00:00 2001 -From: Martino Pilia -Date: Fri, 1 Jun 2018 18:17:57 +0200 -Subject: [PATCH] BUG: fix a bug in - ImageSegmentation/antsAtroposSegmentationImageFilter.h - -This should be pretty obvious, the return type of a getter method was -wrong. ---- - ImageSegmentation/antsAtroposSegmentationImageFilter.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ImageSegmentation/antsAtroposSegmentationImageFilter.h b/ImageSegmentation/antsAtroposSegmentationImageFilter.h -index e4b32a0cf..adeb4baad 100644 ---- a/ImageSegmentation/antsAtroposSegmentationImageFilter.h -+++ b/ImageSegmentation/antsAtroposSegmentationImageFilter.h -@@ -518,7 +518,7 @@ class AtroposSegmentationImageFilter : - /** - * Get the prior label parameters. - */ -- void GetPriorLabelParameterMap() -+ LabelParameterMapType GetPriorLabelParameterMap() - { - return this->m_PriorLabelParameterMap; - } diff --git a/cmake-modules/BuildANTS.cmake b/cmake-modules/BuildANTS.cmake index 1480b79a..10e57d2e 100644 --- a/cmake-modules/BuildANTS.cmake +++ b/cmake-modules/BuildANTS.cmake @@ -51,10 +51,6 @@ 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" @@ -62,7 +58,6 @@ macro(build_ANTS install_prefix staging_prefix itk_dir ) #boost_dir #UPDATE_COMMAND "" SOURCE_DIR ${CMAKE_SOURCE_DIR}/ANTs BINARY_DIR ANTS-build - #PATCH_COMMAND ${PATCH_QUIET} LIST_SEPARATOR ::: CMAKE_GENERATOR ${CMAKE_GEN} CMAKE_ARGS diff --git a/cmake-modules/BuildC3D.cmake b/cmake-modules/BuildC3D.cmake index fbdf1189..72237c63 100644 --- a/cmake-modules/BuildC3D.cmake +++ b/cmake-modules/BuildC3D.cmake @@ -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 @@ -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 diff --git a/cmake-modules/BuildHDF5.cmake b/cmake-modules/BuildHDF5.cmake index a9b0f553..1fca0589 100644 --- a/cmake-modules/BuildHDF5.cmake +++ b/cmake-modules/BuildHDF5.cmake @@ -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} diff --git a/cmake-modules/BuildITKv4.cmake b/cmake-modules/BuildITKv4.cmake index a2d9a567..453d3bc4 100644 --- a/cmake-modules/BuildITKv4.cmake +++ b/cmake-modules/BuildITKv4.cmake @@ -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) @@ -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} diff --git a/cmake-modules/BuildLIBLBFGS.cmake b/cmake-modules/BuildLIBLBFGS.cmake index 7c827453..2cd06f86 100644 --- a/cmake-modules/BuildLIBLBFGS.cmake +++ b/cmake-modules/BuildLIBLBFGS.cmake @@ -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} diff --git a/cmake-modules/BuildNETCDF.cmake b/cmake-modules/BuildNETCDF.cmake index ac2d70be..6cb5f6eb 100644 --- a/cmake-modules/BuildNETCDF.cmake +++ b/cmake-modules/BuildNETCDF.cmake @@ -53,11 +53,6 @@ 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 @@ -65,7 +60,6 @@ macro(build_netcdf install_prefix staging_prefix) URL_MD5 "5456da531d5e3f877e5ea328645b1e68" SOURCE_DIR NETCDF BINARY_DIR NETCDF-build - PATCH_COMMAND ${PATCH_QUIET} LIST_SEPARATOR ::: CMAKE_GENERATOR ${CMAKE_GEN} CMAKE_ARGS diff --git a/cmake-modules/quiet_cmake.patch b/cmake-modules/quiet_cmake.patch deleted file mode 100644 index 495f1c25..00000000 --- a/cmake-modules/quiet_cmake.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- CMakeLists.txt.orig 2016-07-24 11:17:47.000000000 -0400 -+++ CMakeLists.txt 2016-07-24 11:17:52.000000000 -0400 -@@ -0,0 +1,2 @@ -+set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) -+ diff --git a/cmake-modules/quiet_cmake_ccache.patch b/cmake-modules/quiet_cmake_ccache.patch deleted file mode 100644 index d8c14bd6..00000000 --- a/cmake-modules/quiet_cmake_ccache.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2016-07-24 11:17:47.000000000 -0400 -+++ CMakeLists.txt 2016-07-24 11:17:52.000000000 -0400 -@@ -0,0 +1,6 @@ -+set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) -+find_program(CCACHE_FOUND ccache) -+if(CCACHE_FOUND) -+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_FOUND}) -+ set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_FOUND}) -+endif(CCACHE_FOUND) -+