diff options
| author | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-07-05 02:28:32 +0300 |
|---|---|---|
| committer | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-07-05 02:30:05 +0300 |
| commit | 6711aa1db5ccd73286f3a7dfb9d1b120b3f5f9f2 (patch) | |
| tree | d9744e88a1b57046ee19f8bf72ebf2c73ab4ac28 | |
| parent | 144d3718c4197b101c7d61ee6a258200371fb1ab (diff) | |
| download | vcpkg-6711aa1db5ccd73286f3a7dfb9d1b120b3f5f9f2.tar.gz vcpkg-6711aa1db5ccd73286f3a7dfb9d1b120b3f5f9f2.zip | |
[vtk] Update to version 7.1.1
Fix FindHdf5 for shared library. Closes #739, #1129
| -rw-r--r-- | ports/vtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vtk/fix-findhdf5-shared.patch | 20 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 9 |
3 files changed, 26 insertions, 5 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index d963451ce..dc00025bf 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,4 +1,4 @@ Source: vtk -Version: 7.1.0 +Version: 7.1.1 Description: Software system for 3D computer graphics, image processing, and visualization Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, qt5, msmpi diff --git a/ports/vtk/fix-findhdf5-shared.patch b/ports/vtk/fix-findhdf5-shared.patch new file mode 100644 index 000000000..762a9ab07 --- /dev/null +++ b/ports/vtk/fix-findhdf5-shared.patch @@ -0,0 +1,20 @@ +diff --git a/CMake/FindHDF5.cmake b/CMake/FindHDF5.cmake +index 6d558e39b1..9511e9a1ad 100644 +--- a/CMake/FindHDF5.cmake ++++ b/CMake/FindHDF5.cmake +@@ -3,11 +3,11 @@ + # (BUG #0014363). + + # include the default FindHDF5.cmake. +-if(CMAKE_VERSION VERSION_LESS 3.6.1) ++#if(CMAKE_VERSION VERSION_LESS 3.6.1) + include(${CMAKE_CURRENT_LIST_DIR}/NewCMake/FindHDF5.cmake) +-else() +- include(${CMAKE_ROOT}/Modules/FindHDF5.cmake) +-endif() ++#else() ++# include(${CMAKE_ROOT}/Modules/FindHDF5.cmake) ++#endif() + + if(HDF5_FOUND AND (HDF5_IS_PARALLEL OR HDF5_ENABLE_PARALLEL)) + include(vtkMPI) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 611023a61..16854513b 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -1,9 +1,9 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/VTK-7.1.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/VTK-7.1.1) vcpkg_download_distfile(ARCHIVE - URLS "http://www.vtk.org/files/release/7.1/VTK-7.1.0.tar.gz" - FILENAME "VTK-7.1.0.tar.gz" - SHA512 83f0c9291cd2bc517a4bc449ad28a1d77e7ece169e846c7beab0b1140b9ef4b7bad30e3fa6e5a59826a707df78e2e336e07fa8bd30cf7498096ee80feef16534 + URLS "http://www.vtk.org/files/release/7.1/VTK-7.1.1.tar.gz" + FILENAME "VTK-7.1.1.tar.gz" + SHA512 34a068801fe45f98325e5334d2569fc9b15ed38620386f1b5b860c9735e5fb8510953b50a3340d3ef9795e22fecf798c25bf750215b2ff1ff1eb7a1ecd87b623 ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -14,6 +14,7 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/transfer-hdf5-definitions.patch ${CMAKE_CURRENT_LIST_DIR}/netcdf-use-hdf5-definitions.patch ${CMAKE_CURRENT_LIST_DIR}/dont-define-ssize_t.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-findhdf5-shared.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) |