From 186b0ac27bd5a9e0bbcf2c3416ef918a4b7fa446 Mon Sep 17 00:00:00 2001 From: "Vladimir S. FONOV" Date: Thu, 2 Jun 2016 11:00:57 -0400 Subject: [PATCH 01/10] Updated underlying tools, bumped release version --- CMakeLists.txt | 4 ++-- Display | 2 +- EBTKS | 2 +- N3 | 2 +- Register | 2 +- bicgl | 2 +- bicpl | 2 +- classify | 2 +- cmake-modules/BuildNETCDF.cmake | 7 ++----- conglomerate | 2 +- libminc | 2 +- minc-widgets | 2 +- minctools | 2 +- mni_autoreg | 2 +- 14 files changed, 16 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2460797..7f9c966 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 2.8) SET(MINC_TOOLKIT_PACKAGE_VERSION_MAJOR 1) SET(MINC_TOOLKIT_PACKAGE_VERSION_MINOR 0) -SET(MINC_TOOLKIT_PACKAGE_VERSION_PATCH 08) -SET(MINC_TOOLKIT_RELEASE_DATE "20160205") +SET(MINC_TOOLKIT_PACKAGE_VERSION_PATCH 09) +SET(MINC_TOOLKIT_RELEASE_DATE "20160602") SET(MINC_TOOLKIT_VERSION_FULL "${MINC_TOOLKIT_PACKAGE_VERSION_MAJOR}.${MINC_TOOLKIT_PACKAGE_VERSION_MINOR}.${MINC_TOOLKIT_PACKAGE_VERSION_PATCH}-${MINC_TOOLKIT_RELEASE_DATE}") diff --git a/Display b/Display index c4dc4d2..32c843d 160000 --- a/Display +++ b/Display @@ -1 +1 @@ -Subproject commit c4dc4d2be499dcfc9015b191b3013c6ee4d94e42 +Subproject commit 32c843dbb08f05630b88f947563607d698f0fec6 diff --git a/EBTKS b/EBTKS index eab4c14..10aa3c8 160000 --- a/EBTKS +++ b/EBTKS @@ -1 +1 @@ -Subproject commit eab4c148812d8509250842e3351b917a480de936 +Subproject commit 10aa3c856a16ee43a4db4843560e9226a6c9387b diff --git a/N3 b/N3 index 2eddf11..aaa735c 160000 --- a/N3 +++ b/N3 @@ -1 +1 @@ -Subproject commit 2eddf1175c4b2914390de69a0c89b09a5184e0b0 +Subproject commit aaa735c0ad3dc1dcdc42e20840e4f58114407695 diff --git a/Register b/Register index 317c9f0..9b43799 160000 --- a/Register +++ b/Register @@ -1 +1 @@ -Subproject commit 317c9f091d12062ebb6bfd644cef510d6e137101 +Subproject commit 9b437995b3c2bf1dc1884c1f33e8db2de01f5ab4 diff --git a/bicgl b/bicgl index b3c5894..2f16089 160000 --- a/bicgl +++ b/bicgl @@ -1 +1 @@ -Subproject commit b3c58948d3de9257c82b293839891878a4daa237 +Subproject commit 2f160894b8c921c5c40070a3c6907df5ae05b8bb diff --git a/bicpl b/bicpl index b7fbcbc..4da81d9 160000 --- a/bicpl +++ b/bicpl @@ -1 +1 @@ -Subproject commit b7fbcbcb4dd38aa0c122831d2024ab28de6ecb1d +Subproject commit 4da81d962d9fb316ebb27910e965f3821345257d diff --git a/classify b/classify index dc233c5..f67426a 160000 --- a/classify +++ b/classify @@ -1 +1 @@ -Subproject commit dc233c5c66a7a63ae13cec23f18029e6d041ecd7 +Subproject commit f67426ab474807f7879f69061fc11d73100cef3f diff --git a/cmake-modules/BuildNETCDF.cmake b/cmake-modules/BuildNETCDF.cmake index 00cc50e..96204d7 100644 --- a/cmake-modules/BuildNETCDF.cmake +++ b/cmake-modules/BuildNETCDF.cmake @@ -11,8 +11,8 @@ macro(build_netcdf install_prefix staging_prefix) ExternalProject_Add(NETCDF SOURCE_DIR NETCDF - URL "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.3.3.tar.gz" - URL_MD5 "" + URL "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.3.3.1.tar.gz" + URL_MD5 "5c9dad3705a3408d27f696e5b31fb88c" BUILD_IN_SOURCE 1 INSTALL_DIR "${staging_prefix}" BUILD_COMMAND $(MAKE) @@ -24,7 +24,4 @@ SET(NETCDF_LIBRARY ${staging_prefix}/${install_prefix}/lib${LIB_SUFFIX}/libn SET(NETCDF_INCLUDE_DIR ${staging_prefix}/${install_prefix}/include ) SET(NETCDF_FOUND ON) - - - endmacro(build_netcdf) diff --git a/conglomerate b/conglomerate index ec47bca..e6d29b9 160000 --- a/conglomerate +++ b/conglomerate @@ -1 +1 @@ -Subproject commit ec47bcae889630976cc0c63b91a8ec2d4567eaf3 +Subproject commit e6d29b9027a6fd36c91cc6f7604de0200983045a diff --git a/libminc b/libminc index 9c27bde..5ac1aca 160000 --- a/libminc +++ b/libminc @@ -1 +1 @@ -Subproject commit 9c27bde62dbfb80dff3201ad691f046b08bd4986 +Subproject commit 5ac1aca84e316318c74cbb815f16c1487dbbfd60 diff --git a/minc-widgets b/minc-widgets index 360b2f1..f08b643 160000 --- a/minc-widgets +++ b/minc-widgets @@ -1 +1 @@ -Subproject commit 360b2f162114b2f4f48388c1c4905d19511536e1 +Subproject commit f08b643894c81a1a2e0fbfe595a17a42ba8906db diff --git a/minctools b/minctools index a5e6ddb..cd8ea56 160000 --- a/minctools +++ b/minctools @@ -1 +1 @@ -Subproject commit a5e6ddba32ba9d9d6c3c7c672abe3986757cecbb +Subproject commit cd8ea567bd82e803accb087928ac817383b6b02e diff --git a/mni_autoreg b/mni_autoreg index 3e55c19..ea920fb 160000 --- a/mni_autoreg +++ b/mni_autoreg @@ -1 +1 @@ -Subproject commit 3e55c19059cfe78aa5a2ecbe73947edf4b1ce70c +Subproject commit ea920fb2b24ce677e423f1c62a059c84726011da From 38b914fd9e46b9f9b6269b55466ab1234372e50a Mon Sep 17 00:00:00 2001 From: "Vladimir S. FONOV" Date: Wed, 8 Jun 2016 12:58:05 -0400 Subject: [PATCH 02/10] updated bic-pipelines --- bic-pipelines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bic-pipelines b/bic-pipelines index 6290e1e..8efedfc 160000 --- a/bic-pipelines +++ b/bic-pipelines @@ -1 +1 @@ -Subproject commit 6290e1ed363008154b4f87a08d103f1ae6886216 +Subproject commit 8efedfc8fb72d1d9b80fa438091035150bf3efd2 From 690634fc4775e41f94294935f25e192c16f86852 Mon Sep 17 00:00:00 2001 From: "Vladimir S. FONOV" Date: Wed, 8 Jun 2016 12:58:18 -0400 Subject: [PATCH 03/10] Updated Display --- Display | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Display b/Display index 32c843d..fe54d68 160000 --- a/Display +++ b/Display @@ -1 +1 @@ -Subproject commit 32c843dbb08f05630b88f947563607d698f0fec6 +Subproject commit fe54d6857287c4f046a311bd373d81512e91b8f3 From 3191dacd323309b18f9eaf79617df29bb4292969 Mon Sep 17 00:00:00 2001 From: "Robert D. Vincent" Date: Tue, 28 Jun 2016 14:44:20 -0400 Subject: [PATCH 04/10] Add expat to GIFTI_LIBRARY --- cmake-modules/BuildGIFTI.cmake | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cmake-modules/BuildGIFTI.cmake b/cmake-modules/BuildGIFTI.cmake index 60a99a1..1e22ee9 100644 --- a/cmake-modules/BuildGIFTI.cmake +++ b/cmake-modules/BuildGIFTI.cmake @@ -5,19 +5,16 @@ macro(build_gifti install_prefix staging_prefix) set(CMAKE_GEN "${CMAKE_GENERATOR}") endif() - SET(GIFTI_CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) SET(GIFTI_CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) - SET(GIFTI_CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) SET(GIFTI_CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - SET(GIFTI_CMAKE_CXX_FLAGS "-fPIC ${CMAKE_CXX_FLAGS}") SET(GIFTI_CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}") ExternalProject_Add(GIFTI SOURCE_DIR GIFTI BINARY_DIR GIFTI-build - URL "file:///home/rvincent/Dropbox/MCIN/gifticlib-1.0.10-Source.tar.gz" + URL "http://packages.bic.mni.mcgill.ca/tgz/gifticlib-1.0.15-Source.tar.gz" URL_MD5 "" CMAKE_GENERATOR ${CMAKE_GEN} CMAKE_ARGS @@ -27,11 +24,8 @@ ExternalProject_Add(GIFTI -DMACOSX_RPATH:BOOL=ON -DCMAKE_INSTALL_RPATH:PATH=${install_prefix}/lib${LIB_SUFFIX} -DCMAKE_INSTALL_PREFIX:PATH=${install_prefix} - "-DCMAKE_CXX_FLAGS_RELEASE:STRING=${GIFTI_CMAKE_CXX_FLAGS_RELEASE}" "-DCMAKE_C_FLAGS_RELEASE:STRING=${GIFTI_CMAKE_C_FLAGS_RELEASE}" - "-DCMAKE_CXX_FLAGS_DEBUG:STRING=${GIFTI_CMAKE_CXX_FLAGS_DEBUG}" "-DCMAKE_C_FLAGS_DEBUG:STRING=${GIFTI_CMAKE_C_FLAGS_DEBUG}" - "-DCMAKE_CXX_FLAGS:STRING=${GIFTI_CMAKE_CXX_FLAGS}" "-DCMAKE_C_FLAGS:STRING=${GIFTI_CMAKE_C_FLAGS}" -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS} @@ -42,11 +36,13 @@ ExternalProject_Add(GIFTI -DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY} -DNIFTI_INCLUDE_DIR=${NIFTI_INCLUDE_DIR} -DNIFTI_LIBRARY=${NIFTI_LIBRARY} + -DZNZ_LIBRARY=${ZNZ_LIBRARY} + -DUSE_NIFTI_VERSION_1=ON INSTALL_COMMAND $(MAKE) install DESTDIR=${staging_prefix} INSTALL_DIR ${staging_prefix}/${install_prefix} ) -SET(GIFTI_LIBRARY ${staging_prefix}/${install_prefix}/lib${LIB_SUFFIX}/libgiftiio.a ) +SET(GIFTI_LIBRARY ${staging_prefix}/${install_prefix}/lib${LIB_SUFFIX}/libgiftiio.a expat ) SET(GIFTI_INCLUDE_DIR ${staging_prefix}/${install_prefix}/include/gifti ) SET(GIFTI_FOUND ON) From 890474366228d5e12b78b80013285b85a8a9bbf0 Mon Sep 17 00:00:00 2001 From: "Vladimir S. FONOV" Date: Fri, 8 Jul 2016 11:29:30 -0400 Subject: [PATCH 05/10] Added patch to fix ITK 3.20.1 compilation with gcc 5 --- cmake-modules/BuildFREEGLUT.cmake | 2 +- cmake-modules/BuildITKv3.cmake | 1 + cmake-modules/patch_itkv3_gcc5.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 cmake-modules/patch_itkv3_gcc5.patch diff --git a/cmake-modules/BuildFREEGLUT.cmake b/cmake-modules/BuildFREEGLUT.cmake index 8ef5a21..8dad32a 100644 --- a/cmake-modules/BuildFREEGLUT.cmake +++ b/cmake-modules/BuildFREEGLUT.cmake @@ -22,7 +22,7 @@ macro(build_freeglut install_prefix staging_prefix) ExternalProject_Add(FREEGLUT SOURCE_DIR FREEGLUT - URL "http://iweb.dl.sourceforge.net/project/freeglut/freeglut/2.6.0/freeglut-2.6.0.tar.gz" + URL "http://downloads.sourceforge.net/project/freeglut/freeglut/2.6.0/freeglut-2.6.0.tar.gz" URL_MD5 "39f0f2de89f399529d2b981188082218" BUILD_IN_SOURCE 1 INSTALL_DIR "${staging_prefix}" diff --git a/cmake-modules/BuildITKv3.cmake b/cmake-modules/BuildITKv3.cmake index 1c74763..ba5674c 100644 --- a/cmake-modules/BuildITKv3.cmake +++ b/cmake-modules/BuildITKv3.cmake @@ -33,6 +33,7 @@ macro(build_itkv3 install_prefix staging_prefix) # GIT_TAG "537ecca3a2762908c96508ab6f667c049aba44f6" URL "https://github.com/vfonov/ITK/archive/release-3.20-fix-libtiff-v1.tar.gz" URL_MD5 "bba1ad3c4d0817f94bb34653acbba9c0" + PATCH_COMMAND patch -p 1 -d ${CMAKE_CURRENT_BINARY_DIR}/ITKv3 -u -i ${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules/patch_itkv3_gcc5.patch UPDATE_COMMAND "" SOURCE_DIR ITKv3 BINARY_DIR ITKv3-build diff --git a/cmake-modules/patch_itkv3_gcc5.patch b/cmake-modules/patch_itkv3_gcc5.patch new file mode 100644 index 0000000..f1bbd85 --- /dev/null +++ b/cmake-modules/patch_itkv3_gcc5.patch @@ -0,0 +1,26 @@ +diff -ru ITKv3/Utilities/vxl/vcl/vcl_compiler.h ITKv3-patched/Utilities/vxl/vcl/vcl_compiler.h +--- ITKv3/Utilities/vxl/vcl/vcl_compiler.h 2015-02-24 10:54:54.000000000 -0500 ++++ ITKv3-patched/Utilities/vxl/vcl/vcl_compiler.h 2016-07-07 17:40:03.015651756 -0400 +@@ -119,6 +119,8 @@ + # else + # define VCL_GCC_40 + # endif ++# elif (__GNUC__==5) ++# define VCL_GCC_50 + # else + # error "Dunno about this gcc" + # endif +Only in ITKv3-patched/Utilities/vxl/vcl: vcl_compiler.h~ +diff -ru ITKv3/Utilities/vxl/vcl/vcl_new.h ITKv3-patched/Utilities/vxl/vcl/vcl_new.h +--- ITKv3/Utilities/vxl/vcl/vcl_new.h 2015-02-24 10:54:54.000000000 -0500 ++++ ITKv3-patched/Utilities/vxl/vcl/vcl_new.h 2016-07-07 17:42:49.579871279 -0400 +@@ -15,7 +15,7 @@ + # include + + // -------------------- gcc with old library +-#elif defined(VCL_GCC) && !defined(GNU_LIBSTDCXX_V3) ++#elif defined(VCL_GCC) && !defined(GNU_LIBSTDCXX_V3) && !defined(VCL_GCC_50) + # include + + // -------------------- old MSVC +Only in ITKv3-patched/Utilities/vxl/vcl: vcl_new.h~ From 68d5f48520f49c538c28f3f3cf72d53679b0d983 Mon Sep 17 00:00:00 2001 From: "Vladimir S. FONOV" Date: Fri, 8 Jul 2016 11:32:21 -0400 Subject: [PATCH 06/10] Updated libminc, Register,bicpl,libminc,minctools,mni_autoreg --- Display | 2 +- Register | 2 +- bicpl | 2 +- libminc | 2 +- minctools | 2 +- mni_autoreg | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Display b/Display index fe54d68..a147c1c 160000 --- a/Display +++ b/Display @@ -1 +1 @@ -Subproject commit fe54d6857287c4f046a311bd373d81512e91b8f3 +Subproject commit a147c1cc92f1230a3b45837f578fc620ade23171 diff --git a/Register b/Register index 9b43799..d3b70c6 160000 --- a/Register +++ b/Register @@ -1 +1 @@ -Subproject commit 9b437995b3c2bf1dc1884c1f33e8db2de01f5ab4 +Subproject commit d3b70c6a0e596c3494c4c5249ecc9a934e705f9c diff --git a/bicpl b/bicpl index 4da81d9..a0ef8ef 160000 --- a/bicpl +++ b/bicpl @@ -1 +1 @@ -Subproject commit 4da81d962d9fb316ebb27910e965f3821345257d +Subproject commit a0ef8ef6d0f6181da3e2c7142d2da5df08cb69b7 diff --git a/libminc b/libminc index 5ac1aca..17aa090 160000 --- a/libminc +++ b/libminc @@ -1 +1 @@ -Subproject commit 5ac1aca84e316318c74cbb815f16c1487dbbfd60 +Subproject commit 17aa090dc01dee48cf754d7dfe3e4e068738895d diff --git a/minctools b/minctools index cd8ea56..a6e1d08 160000 --- a/minctools +++ b/minctools @@ -1 +1 @@ -Subproject commit cd8ea567bd82e803accb087928ac817383b6b02e +Subproject commit a6e1d08908fff2610bb030c1d5013a35df5e0838 diff --git a/mni_autoreg b/mni_autoreg index ea920fb..938f643 160000 --- a/mni_autoreg +++ b/mni_autoreg @@ -1 +1 @@ -Subproject commit ea920fb2b24ce677e423f1c62a059c84726011da +Subproject commit 938f6434cba87bed88f7f22c257305044ad0d0fd From 83563326a51748c1473a777cba014cea7418dd25 Mon Sep 17 00:00:00 2001 From: "Vladimir S. FONOV" Date: Fri, 2 Sep 2016 14:09:19 -0400 Subject: [PATCH 07/10] Updated libminc --- libminc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libminc b/libminc index 17aa090..44b8d4b 160000 --- a/libminc +++ b/libminc @@ -1 +1 @@ -Subproject commit 17aa090dc01dee48cf754d7dfe3e4e068738895d +Subproject commit 44b8d4b34af12287596b5b9585c2518484e7f9cb From 5c8a9ceef562a9780695800b03c706ad40e35d17 Mon Sep 17 00:00:00 2001 From: "Robert D. Vincent" Date: Wed, 12 Oct 2016 10:09:33 -0400 Subject: [PATCH 08/10] Use newer macro names HDF5_INCLUDE_DIRS and HDF5_LIBRARIES. --- cmake-modules/BuildHDF5.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake-modules/BuildHDF5.cmake b/cmake-modules/BuildHDF5.cmake index 9e244f3..a921959 100644 --- a/cmake-modules/BuildHDF5.cmake +++ b/cmake-modules/BuildHDF5.cmake @@ -14,8 +14,15 @@ ExternalProject_Add(HDF5 # INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external ) +SET(HDF5_BIN_DIR ${staging_prefix}/${install_prefix}/bin ) SET(HDF5_INCLUDE_DIR ${staging_prefix}/${install_prefix}/include ) +SET(HDF5_LIBRARY_DIR ${staging_prefix}/${install_prefix}/lib${LIB_SUFFIX} ) SET(HDF5_LIBRARY ${staging_prefix}/${install_prefix}/lib${LIB_SUFFIX}/libhdf5.a ) + +SET(HDF5_LIBRARIES ${HDF5_LIBRARY}) +SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR}) + +SET(HDF5_DIR ${staging_prefix}/${install_prefix}/share/cmake/hdf5) SET(HDF5_FOUND ON) endmacro(build_hdf5) From 7a5db0882da3065130c45cdcc88c625c62294d13 Mon Sep 17 00:00:00 2001 From: "Robert D. Vincent" Date: Tue, 18 Oct 2016 14:11:29 -0400 Subject: [PATCH 09/10] Add FindOpenJPEG.cmake --- cmake-modules/FindOpenJPEG.cmake | 57 ++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 cmake-modules/FindOpenJPEG.cmake diff --git a/cmake-modules/FindOpenJPEG.cmake b/cmake-modules/FindOpenJPEG.cmake new file mode 100644 index 0000000..5de027f --- /dev/null +++ b/cmake-modules/FindOpenJPEG.cmake @@ -0,0 +1,57 @@ +### +# -*- cmake -*- +# +# File: FindOpenJPEG.cmake +# +# Original script was copied from: +# http://code.google.com/p/emeraldviewer/source/browse/indra/cmake +# +# $Id$ +### + +# - Find OpenJPEG +# Find the OpenJPEG includes and library +# This module defines +# OPENJPEG_INCLUDE_DIR, where to find openjpeg.h, etc. +# OPENJPEG_LIBRARIES, the libraries needed to use OpenJPEG. +# OPENJPEG_FOUND, If false, do not try to use OpenJPEG. +# also defined, but not for general use are +# OPENJPEG_LIBRARY, where to find the OpenJPEG library. + +FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h + PATHS + /usr/local/include/openjpeg + /usr/local/include + /usr/include/openjpeg + /usr/include + PATH_SUFFIXES + openjpeg-2.1 + DOC "Location of OpenJPEG Headers" +) + +SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg) +SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjp2) +FIND_LIBRARY(OPENJPEG_LIBRARY + NAMES ${OPENJPEG_NAMES} + PATHS /usr/lib /usr/local/lib + ) + +IF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR) + SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY}) + SET(OPENJPEG_FOUND "YES") +ELSE (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR) + SET(OPENJPEG_FOUND "NO") +ENDIF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR) + + +IF (OPENJPEG_FOUND) + IF (NOT OPENJPEG_FIND_QUIETLY) + MESSAGE(STATUS "Found OpenJPEG: ${OPENJPEG_LIBRARIES}") + ENDIF (NOT OPENJPEG_FIND_QUIETLY) +ELSE (OPENJPEG_FOUND) + IF (OPENJPEG_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find OpenJPEG library") + ENDIF (OPENJPEG_FIND_REQUIRED) +ENDIF (OPENJPEG_FOUND) + +MARK_AS_ADVANCED(OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR) From 5518027fa2f38fa6536e824dbde987a0034246e4 Mon Sep 17 00:00:00 2001 From: "Robert D. Vincent" Date: Wed, 4 Jan 2017 21:05:29 -0500 Subject: [PATCH 10/10] Update ZLIB URL. --- cmake-modules/BuildZLIB.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake-modules/BuildZLIB.cmake b/cmake-modules/BuildZLIB.cmake index 963d562..6a3561b 100644 --- a/cmake-modules/BuildZLIB.cmake +++ b/cmake-modules/BuildZLIB.cmake @@ -5,7 +5,7 @@ macro(build_zlib install_prefix staging_prefix) SET (ZLIB_VERSION_STRING 1.2) SET (ZLIB_VERSION_MAJOR 1.2) -SET (ZLIB_VERSION_MINOR 8) +SET (ZLIB_VERSION_MINOR 10) set(CMAKE_OSX_EXTERNAL_PROJECT_ARGS) if(APPLE) @@ -19,8 +19,8 @@ endif() ExternalProject_Add(ZLIB - URL "http://zlib.net/zlib-1.2.8.tar.gz" - URL_MD5 "44d667c142d7cda120332623eab69f40" + URL "http://zlib.net/zlib-1.2.10.tar.gz" + URL_MD5 "d9794246f853d15ce0fcbf79b9a3cf13" UPDATE_COMMAND "" SOURCE_DIR ZLIB BINARY_DIR ZLIB-build